Skip to content

Commit f19823c

Browse files
robotgryphonrobotgryphon
committed
Misc. code refactoring
1 parent fbcc0b3 commit f19823c

37 files changed

+417
-266
lines changed

‎build.gradle‎

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,15 @@ minecraft {
107107
property 'mixin.env.remapRefMap', 'true'
108108
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
109109

110+
// JetBrains Runtime Hotswap
111+
jvmArg '-XX:+AllowEnhancedClassRedefinition'
112+
jvmArg '-XX:HotswapAgent=fatjar'
113+
110114
args '--username', 'Nano'
111115
args '--width', 1920
112116
args '--height', 1080
113117

118+
114119
mods {
115120
compactmachines {
116121
source sourceSets.tunnels
@@ -134,6 +139,10 @@ minecraft {
134139
property 'mixin.env.remapRefMap', 'true'
135140
property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg"
136141

142+
// JetBrains Runtime Hotswap
143+
jvmArg '-XX:+AllowEnhancedClassRedefinition'
144+
jvmArg '-XX:HotswapAgent=fatjar'
145+
137146
mods {
138147
compactmachines {
139148
source sourceSets.tunnels
@@ -161,6 +170,12 @@ minecraft {
161170
args '--all'
162171
args '--output', file('src/generated/resources/')
163172

173+
if(!System.getenv().containsKey("CI")) {
174+
// JetBrains Runtime Hotswap
175+
jvmArg '-XX:+AllowEnhancedClassRedefinition'
176+
jvmArg '-XX:HotswapAgent=fatjar'
177+
}
178+
164179
forceExit false
165180

166181
mods {
@@ -193,6 +208,10 @@ minecraft {
193208

194209
forceExit false
195210

211+
// JetBrains Runtime Hotswap
212+
jvmArg '-XX:+AllowEnhancedClassRedefinition'
213+
jvmArg '-XX:HotswapAgent=fatjar'
214+
196215
mods {
197216
compactmachines {
198217
source sourceSets.tunnels
@@ -244,49 +263,48 @@ dependencies {
244263
runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")
245264

246265
// The One Probe
247-
implementation(fg.deobf("curse.maven:theoneprobe-245211:3871444"))
266+
implementation(fg.deobf("curse.maven:theoneprobe-245211:3927520"))
248267

249268
if (!System.getenv().containsKey("CI") && include_test_mods.equals("true")) {
250269
// Nicephore - Screenshots and Stuff
251-
runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3741832"))
252-
253-
// // Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
254-
runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3649270"))
255-
runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3597654"))
256-
runtimeOnly(fg.deobf("curse.maven:pipez-443900:3760255"))
257-
258-
runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3737402"))
259-
runtimeOnly(fg.deobf("curse.maven:create-328085:3737418"))
260-
261-
// runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
262-
// runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
263-
// runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
264-
//
265-
// // Scalable Cat's Force, BdLib, Advanced Generators
266-
// runtimeOnly(fg.deobf("curse.maven:scalable-320926:3634756"))
267-
// runtimeOnly(fg.deobf("curse.maven:bdlib-70496:3663149"))
268-
// runtimeOnly(fg.deobf("curse.maven:advgen-223622:3665335"))
269-
//
270-
// // Immersive Eng - 7.1.0-145 (Dec 31)
271-
// runtimeOnly(fg.deobf("curse.maven:immersiveeng-231951:3587149"))
270+
runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3879841"))
271+
272+
// Testing Mods - Trash Cans, Pipez, Create, Refined Pipes, Pretty Pipes, Refined Storage
273+
runtimeOnly(fg.deobf("curse.maven:SuperMartijn642-454372:3910759"))
274+
runtimeOnly(fg.deobf("curse.maven:trashcans-394535:3871885"))
275+
276+
// runtimeOnly(fg.deobf("curse.maven:flywheel-486392:3871082"))
277+
// runtimeOnly(fg.deobf("curse.maven:create-328085:3737418"))
278+
279+
// runtimeOnly(fg.deobf("curse.maven:refinedpipes-370696:3570151"))
280+
// runtimeOnly(fg.deobf("curse.maven:prettypipes-376737:3573145"))
281+
// runtimeOnly(fg.deobf("curse.maven:refinedstorage-243076:3623324"))
282+
283+
// Scalable Cat's Force, BdLib, Advanced Generators
284+
// runtimeOnly(fg.deobf("curse.maven:scalable-320926:3634756"))
285+
// runtimeOnly(fg.deobf("curse.maven:bdlib-70496:3663149"))
286+
// runtimeOnly(fg.deobf("curse.maven:advgen-223622:3665335"))
287+
288+
// Immersive Eng - 7.1.0-145 (Dec 31)
289+
// runtimeOnly(fg.deobf("curse.maven:immersiveeng-231951:3587149"))
272290

273291
// FTB Chunks
274-
runtimeOnly(fg.deobf("curse.maven:architectury-forge-419699:3781711"))
275-
runtimeOnly(fg.deobf("curse.maven:ftb-teams-404468:3725501"))
276-
runtimeOnly(fg.deobf("curse.maven:ftblib-404465:3725485"))
277-
runtimeOnly(fg.deobf("curse.maven:ftbchunks-314906:3780113"))
292+
// runtimeOnly(fg.deobf("curse.maven:architectury-forge-419699:3781711"))
293+
// runtimeOnly(fg.deobf("curse.maven:ftb-teams-404468:3725501"))
294+
// runtimeOnly(fg.deobf("curse.maven:ftblib-404465:3725485"))
295+
// runtimeOnly(fg.deobf("curse.maven:ftbchunks-314906:3780113"))
278296

279297
// Mekanism + Mek Generators - Tunnel testing
280-
runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3743835"))
281-
runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3743837"))
298+
runtimeOnly(fg.deobf("curse.maven:mekanism-268560:3922056"))
299+
runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3922058"))
282300

283301
// Soul Shards (FTB)
284-
runtimeOnly(fg.deobf("curse.maven:polylib-576589:3751528"))
285-
runtimeOnly(fg.deobf("curse.maven:soulshards-551523:3757202"))
302+
// runtimeOnly(fg.deobf("curse.maven:polylib-576589:3751528"))
303+
// runtimeOnly(fg.deobf("curse.maven:soulshards-551523:3757202"))
286304

287305
// Everlasting Abilities
288-
runtimeOnly(fg.deobf("curse.maven:cyclopscore-232758:3809427"))
289-
runtimeOnly(fg.deobf("curse.maven:everlastabilities-248353:3768481"))
306+
// runtimeOnly(fg.deobf("curse.maven:cyclopscore-232758:3809427"))
307+
// runtimeOnly(fg.deobf("curse.maven:everlastabilities-248353:3768481"))
290308
}
291309
}
292310

‎gradle.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

6-
minecraft_version=1.19.1
7-
forge_version=42.0.1
8-
parchment_version=1.18.2-2022.07.17-1.19.1
6+
minecraft_version=1.19.2
7+
forge_version=43.0.8
8+
parchment_version=2022.08.10-1.19.2
99

1010
mod_id=compactmachines
1111

1212
# Dependencies and Libs
13-
jei_mc_version=1.19.1
14-
jei_version=11.2.0.241
13+
jei_mc_version=1.19.2
14+
jei_version=11.2.0.247
1515
#top_version=1.16-3.1.4-22
1616

1717
# Curseforge
@@ -22,4 +22,4 @@ cf_release_type=release
2222
mixin_version = 0.8.5
2323
mixingradle_version = 0.7-SNAPSHOT
2424

25-
include_test_mods = false
25+
include_test_mods = true

‎src/api/java/dev/compactmods/machines/api/dimension/CompactDimension.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
import net.minecraft.core.Registry;
44
import net.minecraft.resources.ResourceKey;
55
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.server.MinecraftServer;
7+
import net.minecraft.server.level.ServerLevel;
68
import net.minecraft.world.level.Level;
79
import net.minecraft.world.level.dimension.DimensionType;
10+
import org.jetbrains.annotations.Nullable;
811

912
import static dev.compactmods.machines.api.core.Constants.MOD_ID;
1013

@@ -16,4 +19,9 @@ public abstract class CompactDimension {
1619
.create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation(MOD_ID, "compact_world"));
1720

1821
private CompactDimension() {}
22+
23+
@Nullable
24+
public static ServerLevel forServer(MinecraftServer server) {
25+
return server.getLevel(LEVEL_KEY);
26+
}
1927
}

‎src/api/java/dev/compactmods/machines/api/location/IDimensionalPosition.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ public interface IDimensionalPosition {
2222
IDimensionalPosition relative(Direction direction);
2323

2424
Optional<Vec3> getRotation();
25+
26+
boolean isLoaded(MinecraftServer serv);
2527
}

‎src/api/java/dev/compactmods/machines/api/room/RoomSize.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.compactmods.machines.api.room;
22

33
import com.mojang.serialization.Codec;
4+
import net.minecraft.core.Vec3i;
45
import net.minecraft.util.StringRepresentable;
56
import net.minecraft.world.phys.AABB;
67
import net.minecraft.core.BlockPos;
@@ -57,4 +58,8 @@ public static RoomSize getFromSize(String size) {
5758
public String getSerializedName() {
5859
return this.name;
5960
}
61+
62+
public Vec3i toVec3() {
63+
return new Vec3i(internalSize, internalSize, internalSize);
64+
}
6065
}

‎src/datagen/java/dev/compactmods/machines/datagen/AdvancementGenerator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import dev.compactmods.machines.advancement.trigger.BasicPlayerAdvTrigger;
88
import dev.compactmods.machines.advancement.trigger.HowDidYouGetHereTrigger;
99
import dev.compactmods.machines.api.core.Advancements;
10+
import dev.compactmods.machines.api.core.Constants;
1011
import dev.compactmods.machines.i18n.TranslationUtil;
1112
import dev.compactmods.machines.machine.Machines;
1213
import dev.compactmods.machines.shrinking.Shrinking;
@@ -62,7 +63,7 @@ public void run(@Nonnull CachedOutput cache) {
6263
}
6364

6465
private ResourceLocation modLoc(String i) {
65-
return new ResourceLocation(CompactMachines.MOD_ID, i);
66+
return new ResourceLocation(Constants.MOD_ID, i);
6667
}
6768

6869
private void generateAdvancements(Consumer<Advancement> consumer) {

‎src/datagen/java/dev/compactmods/machines/datagen/DataGenUtil.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.mojang.serialization.Codec;
77
import com.mojang.serialization.JsonOps;
88
import dev.compactmods.machines.CompactMachines;
9+
import dev.compactmods.machines.api.core.Constants;
910
import net.minecraft.data.CachedOutput;
1011
import net.minecraft.data.DataProvider;
1112
import net.minecraft.resources.ResourceLocation;
@@ -17,16 +18,16 @@
1718
import java.util.function.BiConsumer;
1819
import java.util.function.Function;
1920

20-
class DataGenUtil {
21-
static <T> BiConsumer<T, ResourceLocation> makeWriter(Gson gson, @Nonnull CachedOutput cache, Path dataDir, ImmutableSet<String> pathParts, Codec<T> codec, HashMap<ResourceLocation, T> set) {
21+
public class DataGenUtil {
22+
public static <T> BiConsumer<T, ResourceLocation> makeWriter(Gson gson, @Nonnull CachedOutput cache, Path dataDir, ImmutableSet<String> pathParts, Codec<T> codec, HashMap<ResourceLocation, T> set) {
2223
return (T resource, ResourceLocation regName) -> {
2324
if (set.containsKey(regName)) {
2425
throw new IllegalStateException("Duplicate resource " + regName);
2526
} else {
2627
String namespace = regName.getNamespace();
2728
String path = regName.getPath();
2829

29-
Path fileLocation = dataDir.resolve(Path.of("data", CompactMachines.MOD_ID));
30+
Path fileLocation = dataDir.resolve(Path.of("data", Constants.MOD_ID));
3031
for (String p : pathParts)
3132
fileLocation = fileLocation.resolve(p);
3233

@@ -52,7 +53,7 @@ static <T> BiConsumer<T, ResourceLocation> makeCustomWriter(Gson gson, @Nonnull
5253
String namespace = regName.getNamespace();
5354
String path = regName.getPath();
5455

55-
Path fileLocation = dataDir.resolve(Path.of("data", CompactMachines.MOD_ID));
56+
Path fileLocation = dataDir.resolve(Path.of("data", Constants.MOD_ID));
5657
for (String p : pathParts)
5758
fileLocation = fileLocation.resolve(p);
5859

‎src/datagen/java/dev/compactmods/machines/datagen/ItemModelGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.compactmods.machines.datagen;
22

3-
import dev.compactmods.machines.CompactMachines;
3+
import dev.compactmods.machines.api.core.Constants;
44
import dev.compactmods.machines.api.room.RoomSize;
55
import dev.compactmods.machines.upgrade.MachineRoomUpgrades;
66
import net.minecraft.data.DataGenerator;
@@ -10,7 +10,7 @@
1010
public class ItemModelGenerator extends ItemModelProvider {
1111

1212
public ItemModelGenerator(DataGenerator generator, ExistingFileHelper existingFileHelper) {
13-
super(generator, CompactMachines.MOD_ID, existingFileHelper);
13+
super(generator, Constants.MOD_ID, existingFileHelper);
1414
}
1515

1616
@Override

‎src/datagen/java/dev/compactmods/machines/datagen/LevelBiomeGenerator.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.google.gson.JsonObject;
99
import com.mojang.serialization.JsonOps;
1010
import dev.compactmods.machines.CompactMachines;
11+
import dev.compactmods.machines.api.core.Constants;
12+
import dev.compactmods.machines.api.dimension.CompactDimension;
1113
import dev.compactmods.machines.dimension.Dimension;
1214
import net.minecraft.core.Holder;
1315
import net.minecraft.core.Registry;
@@ -36,8 +38,7 @@ public class LevelBiomeGenerator implements DataProvider {
3638
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create();
3739
private final DataGenerator generator;
3840

39-
private final ResourceLocation COMPACT_BIOME = new ResourceLocation(CompactMachines.MOD_ID, "machine");
40-
private final ResourceLocation COMPACT_LEVEL = new ResourceLocation(CompactMachines.MOD_ID, "compact_world");
41+
private final ResourceLocation COMPACT_BIOME = new ResourceLocation(Constants.MOD_ID, "machine");
4142

4243
LevelBiomeGenerator(DataGenerator generator) {
4344
this.generator = generator;
@@ -65,7 +66,7 @@ public void run(@Nonnull CachedOutput cache) {
6566
private JsonElement writeFlatDimension(LevelStem dimension) {
6667
JsonObject d = new JsonObject();
6768

68-
d.addProperty("type", COMPACT_LEVEL.toString());
69+
d.addProperty("type", CompactDimension.LEVEL_KEY.toString());
6970

7071
var gen = ChunkGenerator.CODEC.encodeStart(JsonOps.INSTANCE, dimension.generator())
7172
.getOrThrow(false, CompactMachines.LOGGER::error)
@@ -93,11 +94,11 @@ private void writeDimensions(HashMap<ResourceLocation, Biome> biomes, HashMap<Re
9394
var flatSettings = new FlatLevelGeneratorSettings(Optional.empty(), BuiltinRegistries.BIOME);
9495

9596
flatSettings.setBiome(Holder.direct(biomes.get(COMPACT_BIOME)));
96-
flatSettings.getLayersInfo().add(new FlatLayerInfo(dimTypes.get(COMPACT_LEVEL).height(), Dimension.BLOCK_MACHINE_VOID_AIR.get()));
97+
flatSettings.getLayersInfo().add(new FlatLayerInfo(dimTypes.get(CompactDimension.LEVEL_KEY.location()).height(), Dimension.BLOCK_MACHINE_VOID_AIR.get()));
9798
flatSettings.updateLayers();
9899

99-
var stem = new LevelStem(Holder.direct(dimTypes.get(COMPACT_LEVEL)), new FlatLevelSource(ssreg, flatSettings));
100-
consumer.accept(stem, COMPACT_LEVEL);
100+
var stem = new LevelStem(Holder.direct(dimTypes.get(CompactDimension.LEVEL_KEY.location())), new FlatLevelSource(ssreg, flatSettings));
101+
consumer.accept(stem, CompactDimension.LEVEL_KEY.location());
101102
}
102103

103104
private void writeDimensionTypes(BiConsumer<DimensionType, ResourceLocation> consumer) {
@@ -110,7 +111,7 @@ private void writeDimensionTypes(BiConsumer<DimensionType, ResourceLocation> con
110111
.heightBounds(0, 256)
111112
.build();
112113

113-
consumer.accept(dim, COMPACT_LEVEL);
114+
consumer.accept(dim, CompactDimension.LEVEL_KEY.location());
114115
}
115116

116117
private void writeBiomes(BiConsumer<Biome, ResourceLocation> biomeWriter) {
@@ -140,6 +141,6 @@ private void writeBiomes(BiConsumer<Biome, ResourceLocation> biomeWriter) {
140141

141142
@Override
142143
public String getName() {
143-
return CompactMachines.MOD_ID + ":levelgen";
144+
return Constants.MOD_ID + ":levelgen";
144145
}
145146
}

‎src/datagen/java/dev/compactmods/machines/datagen/StateGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.compactmods.machines.datagen;
22

3-
import dev.compactmods.machines.CompactMachines;
4-
import dev.compactmods.machines.machine.CompactMachineBlock;
3+
import dev.compactmods.machines.api.core.Constants;
54
import dev.compactmods.machines.api.room.RoomSize;
5+
import dev.compactmods.machines.machine.CompactMachineBlock;
66
import dev.compactmods.machines.wall.Walls;
77
import net.minecraft.data.DataGenerator;
88
import net.minecraftforge.client.model.generators.BlockStateProvider;
@@ -11,7 +11,7 @@
1111

1212
public class StateGenerator extends BlockStateProvider {
1313
public StateGenerator(DataGenerator gen, ExistingFileHelper exFileHelper) {
14-
super(gen, CompactMachines.MOD_ID, exFileHelper);
14+
super(gen, Constants.MOD_ID, exFileHelper);
1515
}
1616

1717
@Override

0 commit comments

Comments
 (0)