diff --git a/CHANGELOG.md b/CHANGELOG.md index d15d9e400..8e7bf5332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,4 @@ Make sure to clear this after each release Put changelog here: ----------------- -- Fixed custom Grass Color Modifiers to work 100% of the time. -- Added `PlaceInAirBlockItem,` thanks to Qzimyion! -- Added `ShapelessRecipeBuilderExtension` -- Updated to Kotlin 2.1 +- Removed the `loot table whacker.` diff --git a/gradle.properties b/gradle.properties index a2d0929fb..d67ccc645 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ min_loader_version=0.16.0 # Mod Properties - mod_version = 1.9.9 + mod_version = 1.9.10 maven_group = net.frozenblock archives_base_name = FrozenLib diff --git a/src/main/java/net/frozenblock/lib/FrozenClient.java b/src/main/java/net/frozenblock/lib/FrozenClient.java index 47d8077c2..e38b272d1 100644 --- a/src/main/java/net/frozenblock/lib/FrozenClient.java +++ b/src/main/java/net/frozenblock/lib/FrozenClient.java @@ -49,6 +49,8 @@ public final class FrozenClient implements ClientModInitializer { @Override public void onInitializeClient() { + FrozenMain.init(); + FrozenClientRegistry.initRegistry(); ModIntegrations.initializePreFreeze(); // Mod integrations must run after normal mod initialization diff --git a/src/main/java/net/frozenblock/lib/FrozenMain.java b/src/main/java/net/frozenblock/lib/FrozenMain.java index 24c91078f..cf48ab59c 100644 --- a/src/main/java/net/frozenblock/lib/FrozenMain.java +++ b/src/main/java/net/frozenblock/lib/FrozenMain.java @@ -70,13 +70,16 @@ import org.quiltmc.qsl.frozenblock.misc.datafixerupper.impl.ServerFreezer; public final class FrozenMain extends FrozenModInitializer { + public static boolean INITIALIZED = false; public FrozenMain() { super(FrozenSharedConstants.MOD_ID); } - @Override - public void onInitialize(String modId, ModContainer container) { + public static void init() { + if (INITIALIZED) return; + INITIALIZED = true; + FrozenRegistry.initRegistry(); // QUILT INIT @@ -104,6 +107,11 @@ public void onInitialize(String modId, ModContainer container) { ServerCapeData.init(); FrozenMainEntrypoint.EVENT.invoker().init(); // includes dev init + } + + @Override + public void onInitialize(String modId, ModContainer container) { + init(); ArgumentTypeInfos.register( BuiltInRegistries.COMMAND_ARGUMENT_TYPE, diff --git a/src/main/java/net/frozenblock/lib/ingamedevtools/RegisterInGameDevTools.java b/src/main/java/net/frozenblock/lib/ingamedevtools/RegisterInGameDevTools.java index d6a6cf32d..b72e80436 100644 --- a/src/main/java/net/frozenblock/lib/ingamedevtools/RegisterInGameDevTools.java +++ b/src/main/java/net/frozenblock/lib/ingamedevtools/RegisterInGameDevTools.java @@ -19,17 +19,14 @@ import net.frozenblock.lib.FrozenSharedConstants; import net.frozenblock.lib.ingamedevtools.item.Camera; -import net.frozenblock.lib.ingamedevtools.item.LootTableWhacker; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; public class RegisterInGameDevTools { public static final Item CAMERA = new Camera(new Item.Properties().stacksTo(1)); - public static final Item LOOT_TABLE_WHACKER = new LootTableWhacker(new Item.Properties().stacksTo(1)); public static void register() { Registry.register(BuiltInRegistries.ITEM, FrozenSharedConstants.id("camera"), CAMERA); - Registry.register(BuiltInRegistries.ITEM, FrozenSharedConstants.string("loot_table_whacker"), LOOT_TABLE_WHACKER); } } diff --git a/src/main/resources/assets/frozenlib/lang/en_us.json b/src/main/resources/assets/frozenlib/lang/en_us.json index b2a81c1ae..be0e445ac 100644 --- a/src/main/resources/assets/frozenlib/lang/en_us.json +++ b/src/main/resources/assets/frozenlib/lang/en_us.json @@ -110,11 +110,6 @@ "debug.neighbor_update": "Neighbor Updates", "debug.game_event": "Game Events", - "frozenlib.loot_table_whacker.fail.no_name": "Loot Table Whacker has not been named!", - "frozenlib.loot_table_whacker.fail.no_colon": "Invalid ResourceLocation: No : present!", - "frozenlib.loot_table_whacker.fail.no_loot_table": "Loot table does not exist: %s", - "frozenlib.loot_table_whacker.success": "Set loot table to: %s", - "frozenlib.core.registry_sync.more": "%s more...", "frozenlib.core.registry_sync.and": " and ", "frozenlib.core.registry_sync.unsupported_mod_protocol": "Unsupported mod protocol versions for:\n%s",