Skip to content

Commit 9a2cb21

Browse files
committed
Test removal and new API preparation
1 parent fad3261 commit 9a2cb21

67 files changed

Lines changed: 55 additions & 3155 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ group = mod_group_id
1919

2020
repositories {
2121
mavenLocal()
22+
maven { url = "https://maven.liukrast.net" }
2223
maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
2324
maven { url = "https://mvn.devos.one/snapshots" } // Registrate
2425
maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" }
@@ -36,10 +37,6 @@ base {
3637
// Mojang ships Java 21 to end users in 1.21.1, so mods should target Java 21.
3738
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
3839

39-
sourceSets {
40-
test
41-
}
42-
4340
neoForge {
4441
// Specify the version of NeoForge to use.
4542
version = project.neo_version
@@ -109,20 +106,9 @@ neoForge {
109106
"${mod_id}" {
110107
sourceSet(sourceSets.main)
111108
}
112-
113-
fluid {
114-
sourceSet(sourceSets.test)
115-
}
116109
}
117110
}
118111

119-
configurations {
120-
runtimeClasspath.extendsFrom localRuntime
121-
testImplementation.extendsFrom implementation
122-
testCompileOnly.extendsFrom compileOnly
123-
testRuntimeOnly.extendsFrom runtimeOnly
124-
}
125-
126112
dependencies {
127113
implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
128114
implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}")
@@ -139,6 +125,8 @@ dependencies {
139125

140126
implementation fileTree(dir: "${rootDir}/libs", include: ['*.jar'])
141127

128+
implementation("net.liukrast:repackaged-1.21.1:0.0.2")
129+
142130

143131
}
144132

@@ -177,27 +165,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
177165
sourceSets.main.resources.srcDir generateModMetadata
178166
// To avoid having to run "generateModMetadata" manually, make it run on every project reload
179167
neoForge.ideSyncTask generateModMetadata
180-
var generateTestMetadata = tasks.register("generateTestMetadata", ProcessResources) {
181-
var replaceProperties = [
182-
minecraft_version : minecraft_version,
183-
minecraft_version_range: minecraft_version_range,
184-
neo_version : neo_version,
185-
loader_version_range : loader_version_range,
186-
mod_id : mod_id,
187-
mod_name : mod_name,
188-
mod_license : mod_license,
189-
mod_version : mod_version,
190-
mod_authors : mod_authors,
191-
mod_description : mod_description,
192-
create_version_range : create_version_range
193-
]
194-
inputs.properties replaceProperties
195-
expand replaceProperties
196-
from "src/test/templates"
197-
into "build/generated/sources/testMetadata"
198-
}
199-
sourceSets.test.resources.srcDir generateTestMetadata
200-
neoForge.ideSyncTask generateTestMetadata
201168

202169
// Example configuration to allow publishing using the maven-publish plugin
203170
publishing {
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package net.liukrast.deployer.lib.logistics;
2+
3+
import com.simibubi.create.content.logistics.packagerLink.LogisticallyLinkedBlockItem;
4+
import com.simibubi.create.foundation.utility.CreateLang;
5+
import net.minecraft.ChatFormatting;
6+
import net.minecraft.core.component.DataComponents;
7+
import net.minecraft.nbt.CompoundTag;
8+
import net.minecraft.network.chat.Component;
9+
import net.minecraft.world.entity.player.Player;
10+
import net.minecraft.world.item.Item;
11+
import net.minecraft.world.item.ItemStack;
12+
import net.minecraft.world.item.TooltipFlag;
13+
import net.minecraft.world.item.component.CustomData;
14+
import org.jetbrains.annotations.Nullable;
15+
16+
import java.util.List;
17+
import java.util.UUID;
18+
19+
public interface LogisticallyLinked {
20+
21+
default boolean isFoil(ItemStack stack) {
22+
return isTuned(stack);
23+
}
24+
25+
default boolean isTuned(ItemStack stack) {
26+
return LogisticallyLinkedBlockItem.isTuned(stack);
27+
}
28+
29+
default void assignFrequency(ItemStack stack, Player player, UUID frequency) {
30+
LogisticallyLinkedBlockItem.assignFrequency(stack, player, frequency);
31+
}
32+
33+
@Nullable
34+
default UUID networkFromStack(ItemStack stack) {
35+
return LogisticallyLinkedBlockItem.networkFromStack(stack);
36+
}
37+
38+
default void appendHoverText(ItemStack stack, Item.TooltipContext tooltipContext,
39+
List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
40+
var uuid = networkFromStack(stack);
41+
if(uuid == null) return;
42+
43+
CreateLang.translate("logistically_linked.tooltip")
44+
.style(ChatFormatting.GOLD)
45+
.addTo(tooltipComponents);
46+
47+
CreateLang.translate("logistically_linked.tooltip_clear")
48+
.style(ChatFormatting.GRAY)
49+
.addTo(tooltipComponents);
50+
}
51+
52+
}

src/test/java/net/liukrast/repackage/Repackaged.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/RepackagedClient.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/RepackagedConstants.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/content/energy/BatteryChargerBlockEntity.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/content/energy/Energy.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/content/energy/EnergyInventorySummary.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/content/energy/EnergyManipulationBehaviour.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/test/java/net/liukrast/repackage/content/energy/EnergyStack.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)