Skip to content

Commit 0351da9

Browse files
committed
Work on addressing misc TODOs and only bother serializing the frequency identity to items and relook up the frequency when placed rather than looking it up and creating with extra data if it was deleted
1 parent d96433c commit 0351da9

26 files changed

+77
-158
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,13 +413,13 @@ dependencies {
413413
compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-common-api:${jei_version}")
414414
compileOnly("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge-api:${jei_version}")
415415
if (recipe_viewer == 'jei' || recipe_viewer == 'hybrid') {
416-
//TODO - 1.20.5: Re-enable when JEI updates
416+
//TODO: Re-enable when JEI updates
417417
//localRuntime("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge:${jei_version}")
418418
}
419419

420420
compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
421421
def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
422-
//TODO - 1.20.5: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
422+
//TODO: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
423423
//Compile against full emi in datagen
424424
datagenMainCompileOnly(emi)
425425
if (recipe_viewer == 'emi' || recipe_viewer == 'hybrid') {
@@ -429,14 +429,14 @@ dependencies {
429429
datagenMainRuntimeOnly(emi)
430430
}
431431

432-
//TODO - 1.19: Re-enable once https://github.com/Chisel-Team/ConnectedTexturesMod/pull/204 is merged
432+
//TODO: Re-enable once an update is released for the current MC version
433433
//localRuntime("team.chisel.ctm:CTM:${minecraft_version}-${ctm_version}")
434434

435435
//TODO: Remove having to specify these as non transitive once https://github.com/McJtyMods/TheOneProbe/issues/548 is fixed
436436
compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}:api") {
437437
transitive = false
438438
}
439-
//TODO - 1.20.4: Re-enable once it doesn't cause connection issues on servers
439+
//TODO: Re-enable once it doesn't cause connection issues on servers
440440
/*localRuntime("mcjty.theoneprobe:theoneprobe:${top_version}") {
441441
transitive = false
442442
}*/
@@ -446,11 +446,11 @@ dependencies {
446446

447447
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
448448
compileOnly(crt)
449-
//TODO - 1.20.5: Re-enable when it updates
449+
//TODO: Re-enable when it updates
450450
//localRuntime(crt)
451451
def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-${previous_minecraft_version}:${jeitweaker_version}"
452452
compileOnly(jeiTweaker)
453-
//TODO - 1.20.5: Re-enable when it updates
453+
//TODO: Re-enable when it updates
454454
//localRuntime(jeiTweaker)
455455

456456
compileOnly("dev.gigaherz.jsonthings:JsonThings-${previous_minor_minecraft_version}:${json_things_version}")

src/api/java/mekanism/api/gear/config/ModuleConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ protected static <DATA, CONFIG extends ModuleConfig<DATA>> P1<Mu<CONFIG>, String
4242
return instance.group(ExtraCodecs.NON_EMPTY_STRING.fieldOf(SerializationConstants.NAME).forGetter(ModuleConfig::name));
4343
}
4444

45-
//TODO - 1.20.5: Do we want to make module configs be a registry or something rather than being named?
45+
//TODO: Do we want to make module configs be a registry or something rather than being named?
46+
// It probably won't make that much difference as it still would need to keep track of the
47+
// "config type" which would basically just be a named registry object
4648
private final String name;
4749

4850
protected ModuleConfig(String name) {

src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_dashboard.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_drive_array.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_exporter.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_importer.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/qio_redstone_adapter.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/quantum_entangloporter.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/teleporter.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)