diff --git a/gradle.properties b/gradle.properties index 2c6db96..c13c764 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ forge_version_range=[47,) mod_id=cuboidmod mod_name=CuboidDroid's Support Mod mod_license=LGPL-3.0 -mod_version=0.3.0 +mod_version=0.3.1 mod_group_id=com.cuboiddroid.cuboidmod mod_authors=CuboidDroid, Leialoha diff --git a/src/generated/resources/assets/cuboidmod/models/item/cobalt_dust.json b/src/generated/resources/assets/cuboidmod/models/item/cobalt_dust.json deleted file mode 100644 index 57f0942..0000000 --- a/src/generated/resources/assets/cuboidmod/models/item/cobalt_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "cuboidmod:item/cobalt_dust" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/cuboidmod/tags/items/dusts.json b/src/generated/resources/data/cuboidmod/tags/items/dusts.json index caeea32..0ac530c 100644 --- a/src/generated/resources/data/cuboidmod/tags/items/dusts.json +++ b/src/generated/resources/data/cuboidmod/tags/items/dusts.json @@ -7,7 +7,6 @@ "#forge:dusts/thatldu", "#forge:dusts/silica", "#forge:dusts/zinc", - "#forge:dusts/cobalt", "#cuboidmod:cellulose", "#forge:dusts/salt", "#forge:dusts/silica" diff --git a/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities.json b/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities.json index d58fd4f..905adf6 100644 --- a/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities.json +++ b/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities.json @@ -43,7 +43,6 @@ "#cuboidmod:quantum_singularities/uranium", "#cuboidmod:quantum_singularities/uraninite", "#cuboidmod:quantum_singularities/osmium", - "#cuboidmod:quantum_singularities/cobalt", "#cuboidmod:quantum_singularities/diamond", "#cuboidmod:quantum_singularities/emerald", "#cuboidmod:quantum_singularities/steel", diff --git a/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities/cobalt.json b/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities/cobalt.json deleted file mode 100644 index 41fb2e3..0000000 --- a/src/generated/resources/data/cuboidmod/tags/items/quantum_singularities/cobalt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "cuboidmod:cobalt_quantum_singularity" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/cobalt.json b/src/generated/resources/data/forge/tags/items/dusts/cobalt.json deleted file mode 100644 index 86cdd23..0000000 --- a/src/generated/resources/data/forge/tags/items/dusts/cobalt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "cuboidmod:cobalt_dust" - ] -} \ No newline at end of file diff --git a/src/main/java/com/cuboiddroid/cuboidmod/Config.java b/src/main/java/com/cuboiddroid/cuboidmod/Config.java index 962d256..bafb776 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/Config.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/Config.java @@ -717,7 +717,7 @@ public static void onReload(final ModConfigEvent.Reloading configEvent) { @SubscribeEvent public static void onWorldLoad(final LevelEvent.Load event) { - Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-client.toml")); - Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-common.toml")); + Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-client.toml")); + Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-common.toml")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/CuboidMod.java b/src/main/java/com/cuboiddroid/cuboidmod/CuboidMod.java index 729e4f1..d07675c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/CuboidMod.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/CuboidMod.java @@ -26,8 +26,8 @@ public CuboidMod() { Registration.register(); - Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-client.toml")); - Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve("cuboidmod-common.toml")); + Config.loadConfig(Config.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-client.toml")); + Config.loadConfig(Config.COMMON_CONFIG, FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "-common.toml")); Registration.registerConfigs(); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/CollapsingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/CollapsingRecipeCategoryJei.java index 10298c4..579e7f1 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/CollapsingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/CollapsingRecipeCategoryJei.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.compat.jei; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.recipe.QuantumCollapsingRecipe; import com.cuboiddroid.cuboidmod.modules.collapser.screen.QuantumCollapserScreenBase; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -42,7 +43,7 @@ public CollapsingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false); itemBar = guiHelper.drawableBuilder(QuantumCollapserScreenBase.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.collapsing"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".collapsing"); } private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) { @@ -107,7 +108,7 @@ public void draw(QuantumCollapsingRecipe recipe, IRecipeSlotsView recipeSlotsVie int workSeconds = recipe.getWorkTicks() / 20; int workDecimal = (recipe.getWorkTicks() % 20) / 2; - String arrowText = "" + workSeconds + "." + workDecimal + " s"; + String arrowText = workSeconds + "." + workDecimal + " s"; renderScaledTextWithShadow(guiGraphics, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF); // required amounts diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/DryingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/DryingRecipeCategoryJei.java index 6f9a1ff..4dd6b17 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/DryingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/DryingRecipeCategoryJei.java @@ -45,7 +45,7 @@ public DryingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); dryingBar = guiHelper.drawableBuilder(GUI, 184, 0, 6, 13) .buildAnimated(200, IDrawableAnimated.StartDirection.TOP, false); - localizedName = Component.translatable("jei.category.cuboidmod.drying"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".drying"); } private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) { @@ -121,7 +121,7 @@ public void draw(DryingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraph int workSeconds = recipe.getWorkTicks() / 20; int workDecimal = (recipe.getWorkTicks() % 20) / 2; - String dryingTimeText = "" + workSeconds + "." + workDecimal + " s"; + String dryingTimeText = workSeconds + "." + workDecimal + " s"; renderScaledTextWithShadow(matrix, font, Component.literal(dryingTimeText), 40 - GUI_START_X, 42 - GUI_START_Y, 24, 0.8f, 0xFFFFFF); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/InscribingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/InscribingRecipeCategoryJei.java index cca4c75..a44aa16 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/InscribingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/InscribingRecipeCategoryJei.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.compat.jei; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.refinedinscriber.recipe.InscribingRecipe; import com.cuboiddroid.cuboidmod.modules.refinedinscriber.screen.RefinedInscriberScreen; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -42,7 +43,7 @@ public InscribingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false); energyBar = guiHelper.drawableBuilder(RefinedInscriberScreen.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.inscribing"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".inscribing"); } private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) { @@ -111,13 +112,13 @@ public void draw(InscribingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiG int workSeconds = recipe.getWorkTicks() / 20; int workDecimal = (recipe.getWorkTicks() % 20) / 2; - String arrowText = "" + workSeconds + "." + workDecimal + " s"; + String arrowText = workSeconds + "." + workDecimal + " s"; renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 104 - GUI_START_X, 73 - GUI_START_Y, 24, 0.6f, 0xFFFFFF); // energy energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y); - String energyText = "" + recipe.getEnergyRequired() + " FE"; + String energyText = recipe.getEnergyRequired() + " FE"; renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/PowerGeneratingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/PowerGeneratingRecipeCategoryJei.java index 6f2b2f1..c07e79c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/PowerGeneratingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/PowerGeneratingRecipeCategoryJei.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.compat.jei; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.recipe.PowerGeneratingRecipe; import com.cuboiddroid.cuboidmod.modules.powergen.screen.SingularityPowerGeneratorScreenBase; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -44,7 +45,7 @@ public PowerGeneratingRecipeCategoryJei(IGuiHelper guiHelper) { icon = guiHelper.createDrawableItemStack(new ItemStack(ModBlocks.THATLDU_SINGULARITY_POWER_GENERATOR.get())); energyBar = guiHelper.drawableBuilder(SingularityPowerGeneratorScreenBase.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.power_generating"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".power_generating"); notsogudiumEnergyPerTick = Config.notsogudiumSingularityPowerGeneratorBaseEnergyGenerated.get(); @@ -127,7 +128,7 @@ public void draw(PowerGeneratingRecipe recipe, IRecipeSlotsView recipeSlotsView, energyBar.draw(matrix, 33 - GUI_START_X, 34 - GUI_START_Y); float multiplier = recipe.getPowerMultiplier(); - String energyText = "" + multiplier + "x"; + String energyText = multiplier + "x"; renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 33 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF); renderScaledText(matrix, font, Component.literal("Notso.: " + String.format("%.02f", notsogudiumEnergyPerTick * multiplier) + " FE/t"), 74, 2, 0.6F, 0x444444); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/RecyclingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/RecyclingRecipeCategoryJei.java index 60aa210..6dda7f5 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/RecyclingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/RecyclingRecipeCategoryJei.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.compat.jei; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.recycler.recipe.RecyclingRecipe; import com.cuboiddroid.cuboidmod.modules.recycler.screen.MolecularRecyclerScreen; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -44,7 +45,7 @@ public RecyclingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false); energyBar = guiHelper.drawableBuilder(MolecularRecyclerScreen.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.recycling"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".recycling"); } private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) { @@ -126,13 +127,13 @@ public void draw(RecyclingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGr int workSeconds = recipe.getWorkTicks() / 20; int workDecimal = (recipe.getWorkTicks() % 20) / 2; - String arrowText = "" + workSeconds + "." + workDecimal + " s"; + String arrowText = workSeconds + "." + workDecimal + " s"; renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF); // energy energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y); - String energyText = "" + recipe.getEnergyRequired() + " FE"; + String energyText = recipe.getEnergyRequired() + " FE"; renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF); // % chances on outputs diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/ResourceGeneratingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/ResourceGeneratingRecipeCategoryJei.java index af89080..2899e57 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/ResourceGeneratingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/ResourceGeneratingRecipeCategoryJei.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.compat.jei; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.recipe.ResourceGeneratingRecipe; import com.cuboiddroid.cuboidmod.modules.resourcegen.screen.SingularityResourceGeneratorScreenBase; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -48,7 +49,7 @@ public ResourceGeneratingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false); itemBar = guiHelper.drawableBuilder(SingularityResourceGeneratorScreenBase.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.resource_generating"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".resource_generating"); notsogudiumItemsPerSecond = 20.0F * Config.notsogudiumSingularityResourceGeneratorItemsPerOperation.get() diff --git a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/TransmutingRecipeCategoryJei.java b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/TransmutingRecipeCategoryJei.java index 7d64800..c5c83ff 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/TransmutingRecipeCategoryJei.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/compat/jei/TransmutingRecipeCategoryJei.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.compat.jei; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.transmuter.recipe.TransmutingRecipe; import com.cuboiddroid.cuboidmod.modules.transmuter.screen.QuantumTransmutationChamberScreen; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -42,7 +43,7 @@ public TransmutingRecipeCategoryJei(IGuiHelper guiHelper) { .buildAnimated(200, IDrawableAnimated.StartDirection.LEFT, false); energyBar = guiHelper.drawableBuilder(QuantumTransmutationChamberScreen.GUI, 176, 0, 8, 36) .buildAnimated(200, IDrawableAnimated.StartDirection.BOTTOM, false); - localizedName = Component.translatable("jei.category.cuboidmod.transmuting"); + localizedName = Component.translatable("jei.category." + CuboidMod.MOD_ID + ".transmuting"); } private static void renderScaledTextWithShadow(GuiGraphics guiGraphics, Font font, Component text, int x, int y, int width, float scale, int color) { @@ -109,13 +110,13 @@ public void draw(TransmutingRecipe recipe, IRecipeSlotsView recipeSlotsView, Gui int workSeconds = recipe.getWorkTicks() / 20; int workDecimal = (recipe.getWorkTicks() % 20) / 2; - String arrowText = "" + workSeconds + "." + workDecimal + " s"; + String arrowText = workSeconds + "." + workDecimal + " s"; renderScaledTextWithShadow(matrix, font, Component.literal(arrowText), 78 - GUI_START_X, 61 - GUI_START_Y, 24, 0.6f, 0xFFFFFF); // energy energyBar.draw(matrix, 32 - GUI_START_X, 34 - GUI_START_Y); - String energyText = "" + recipe.getEnergyRequired() + " FE"; + String energyText = recipe.getEnergyRequired() + " FE"; renderScaledTextWithShadow(matrix, font, Component.literal(energyText), 32 - GUI_START_X, 71 - GUI_START_Y, 8, 0.6f, 0xFFFFFF); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModBlockModelProvider.java b/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModBlockModelProvider.java index c145f91..a0e51d6 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModBlockModelProvider.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModBlockModelProvider.java @@ -65,10 +65,10 @@ private void registerGenerators() { .texture("core", "block/model/singularity_resource_generator_pillar_lit"); withExistingParent(material + "_singularity_power_generator", modLoc("block/templates/singularity_power_generator")) - .texture("frame", "cuboidmod:block/model/" + material + "_singularity_power_gen_frame") + .texture("frame", "block/model/" + material + "_singularity_power_gen_frame") .texture("core", "block/model/singularity_power_gen_core"); withExistingParent(material + "_singularity_power_generator_lit", modLoc("block/templates/singularity_power_generator")) - .texture("frame", "cuboidmod:block/model/" + material + "_singularity_power_gen_frame") + .texture("frame", "block/model/" + material + "_singularity_power_gen_frame") .texture("core", "block/model/singularity_power_gen_core_lit"); withExistingParent(material + "_quantum_collapser", modLoc("block/templates/quantum_collapser")) diff --git a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java b/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java index 55a7488..2a3b1a6 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java @@ -78,7 +78,6 @@ private void registerQuantumSingularityModels() { "uranium", "uraninite", "osmium", - "cobalt", "diamond", "emerald", @@ -179,7 +178,6 @@ private void registerItemGeneratedModels() { builder(itemGenerated, "thatldu_upgrade_smithing_template"); builder(itemGenerated, "zinc_dust"); - builder(itemGenerated, "cobalt_dust"); builder(itemGenerated, ArachnuggetItem.ID_STRING); builder(itemGenerated, BrothItem.ID_STRING); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java b/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java index 7728f64..70c4a31 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java @@ -143,7 +143,6 @@ private void addDustItemTags() { tag(ModTags.Items.DUSTS_THATLDU).add(ModItems.THATLDU_DUST.get()); tag(ModTags.Items.DUSTS_SILICA).add(ModItems.SILICA_DUST.get()); tag(ModTags.Items.DUSTS_ZINC).add(ModItems.ZINC_DUST.get()); - tag(ModTags.Items.DUSTS_COBALT).add(ModItems.COBALT_DUST.get()); tag(ModTags.Items.DUSTS_SALT).add(ModItems.SALT.get()); tag(ModTags.Items.CELLULOSE).add(ModItems.CELLULOSE.get()); @@ -154,7 +153,6 @@ private void addDustItemTags() { tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_THATLDU); tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SILICA); tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_ZINC); - tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_COBALT); tag(ModTags.Items.DUSTS).addTag(ModTags.Items.CELLULOSE); tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SALT); tag(ModTags.Items.DUSTS).addTag(ModTags.Items.DUSTS_SILICA); @@ -354,7 +352,6 @@ private void addSingularityTags() tag(ModTags.Items.QUANTUM_SINGULARITIES_URANIUM).add(ModItems.URANIUM_QUANTUM_SINGULARITY.get()); tag(ModTags.Items.QUANTUM_SINGULARITIES_URANINITE).add(ModItems.URANINITE_QUANTUM_SINGULARITY.get()); tag(ModTags.Items.QUANTUM_SINGULARITIES_OSMIUM).add(ModItems.OSMIUM_QUANTUM_SINGULARITY.get()); - tag(ModTags.Items.QUANTUM_SINGULARITIES_COBALT).add(ModItems.COBALT_QUANTUM_SINGULARITY.get()); tag(ModTags.Items.QUANTUM_SINGULARITIES_DIAMOND).add(ModItems.DIAMOND_QUANTUM_SINGULARITY.get()); tag(ModTags.Items.QUANTUM_SINGULARITIES_EMERALD).add(ModItems.EMERALD_QUANTUM_SINGULARITY.get()); @@ -411,7 +408,6 @@ private void addSingularityTags() ModTags.Items.QUANTUM_SINGULARITIES_URANIUM, ModTags.Items.QUANTUM_SINGULARITIES_URANINITE, ModTags.Items.QUANTUM_SINGULARITIES_OSMIUM, - ModTags.Items.QUANTUM_SINGULARITIES_COBALT, ModTags.Items.QUANTUM_SINGULARITIES_DIAMOND, ModTags.Items.QUANTUM_SINGULARITIES_EMERALD, diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/CryogenicDimensionalTeleporterBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/CryogenicDimensionalTeleporterBlock.java index 24d6133..5f47cf1 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/CryogenicDimensionalTeleporterBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/CryogenicDimensionalTeleporterBlock.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.cdt.block; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.cdt.tile.CryogenicDimensionalTeleporterTileEntity; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -103,7 +104,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("item.cuboidmod.cryogenic_dimensional_teleporter.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".cryogenic_dimensional_teleporter.hover_text")); } @Nullable diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedEndStoneBricksBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedEndStoneBricksBlock.java index a45536b..f4c3f19 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedEndStoneBricksBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedEndStoneBricksBlock.java @@ -28,6 +28,6 @@ public EnergizedEndStoneBricksBlock() { @Override public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List list, TooltipFlag flag) { - list.add(Component.translatable("block.cuboidmod.energized_end_stone_bricks.hover_text")); + list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_end_stone_bricks.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedNetherBricksBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedNetherBricksBlock.java index db0899e..96c24b8 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedNetherBricksBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedNetherBricksBlock.java @@ -29,6 +29,6 @@ public EnergizedNetherBricksBlock() { @Override public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List list, TooltipFlag flag) { - list.add(Component.translatable("block.cuboidmod.energized_nether_bricks.hover_text")); + list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_nether_bricks.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedStoneBricksBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedStoneBricksBlock.java index e3b1bc0..c512980 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedStoneBricksBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedStoneBricksBlock.java @@ -28,6 +28,6 @@ public EnergizedStoneBricksBlock() { @Override public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List list, TooltipFlag flag) { - list.add(Component.translatable("block.cuboidmod.energized_stone_bricks.hover_text")); + list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_stone_bricks.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedThatlduviumBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedThatlduviumBlock.java index fa949cb..be7878c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedThatlduviumBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/block/EnergizedThatlduviumBlock.java @@ -28,6 +28,6 @@ public EnergizedThatlduviumBlock() { @Override public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List list, TooltipFlag flag) { - list.add(Component.translatable("block.cuboidmod.energized_thatlduvium.hover_text")); + list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".energized_thatlduvium.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/tile/CryogenicDimensionalTeleporterTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/tile/CryogenicDimensionalTeleporterTileEntity.java index 3ac0bb8..ac7b6a3 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/tile/CryogenicDimensionalTeleporterTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/cdt/tile/CryogenicDimensionalTeleporterTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.cdt.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.util.CuboidEnergyStorage; @@ -80,7 +81,7 @@ public boolean setTargetDimensionWithKeyItem(ServerPlayer serverPlayer, ItemStac targetDimension = "minecraft:overworld"; } else if (stack.getItem() == ModBlocks.ENERGIZED_THATLDUVIUM.get().asItem()) { keyItem = stack.copy(); - targetDimension = "cuboidmod:cuboid_overworld"; + targetDimension = CuboidMod.MOD_ID + ":cuboid_overworld"; GameStageHelper.addStage(serverPlayer, "cuboid_overworld_access"); } else if (stack.getItem() == ModBlocks.ENERGIZED_NETHER_BRICKS.get().asItem()) { keyItem = stack.copy(); @@ -144,7 +145,7 @@ public void onTeleport() { } public MutableComponent getDisplayName() { - return Component.translatable("container.cuboidmod.cryogenic_dimensional_teleporter"); + return Component.translatable("container." + CuboidMod.MOD_ID + ".cryogenic_dimensional_teleporter"); } public static void gameTick(Level level, BlockPos pos, BlockState blockState, CryogenicDimensionalTeleporterTileEntity blockEntity) { @@ -290,6 +291,6 @@ public boolean isTargetTheOverworld() { } public boolean isTargetCuboidOverworld() { - return targetDimension.equalsIgnoreCase("cuboidmod:cuboid_overworld"); + return targetDimension.equalsIgnoreCase(CuboidMod.MOD_ID + ":cuboid_overworld"); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/handler/ColorHandler.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/handler/ColorHandler.java index db9aa46..c73f399 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/handler/ColorHandler.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/handler/ColorHandler.java @@ -47,7 +47,6 @@ public void onItemColors(RegisterColorHandlersEvent.Item event) { event.register(new IColored.ItemColors(), ModItems.WIKIDIUM_QUANTUM_SINGULARITY.get()); event.register(new IColored.ItemColors(), ModItems.ALUMINIUM_QUANTUM_SINGULARITY.get()); - event.register(new IColored.ItemColors(), ModItems.COBALT_QUANTUM_SINGULARITY.get()); event.register(new IColored.ItemColors(), ModItems.COPPER_QUANTUM_SINGULARITY.get()); event.register(new IColored.ItemColors(), ModItems.GOLD_QUANTUM_SINGULARITY.get()); event.register(new IColored.ItemColors(), ModItems.IRON_QUANTUM_SINGULARITY.get()); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/item/CobaltQuantumSingularityItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/item/CobaltQuantumSingularityItem.java deleted file mode 100644 index 072d2cb..0000000 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/item/CobaltQuantumSingularityItem.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cuboiddroid.cuboidmod.modules.collapser.item; - -import com.cuboiddroid.cuboidmod.CuboidMod; -import com.cuboiddroid.cuboidmod.modules.collapser.registry.QuantumSingularityRegistry; -import net.minecraft.resources.ResourceLocation; - -public class CobaltQuantumSingularityItem extends QuantumSingularityItemBase { - public CobaltQuantumSingularityItem() { - super(new Properties(), - QuantumSingularityRegistry.getInstance() - .getSingularityById(new ResourceLocation(CuboidMod.MOD_ID, "cobalt"))); - } -} diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/QuantumCollapsingRecipe.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/QuantumCollapsingRecipe.java index 39495f3..07c0d40 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/QuantumCollapsingRecipe.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/QuantumCollapsingRecipe.java @@ -184,10 +184,10 @@ public static class Serializer implements RecipeSerializer defaults() { return Lists.newArrayList( new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "andesite"), - "cuboidmod.quantum_singularity.andesite", + CuboidMod.MOD_ID + ".quantum_singularity.andesite", new int[]{0xA8AA9A, 0x7F7F7F}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "basalt"), - "cuboidmod.quantum_singularity.basalt", + CuboidMod.MOD_ID + ".quantum_singularity.basalt", new int[]{0x5C5C5C, 0x353641}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "blackstone"), - "cuboidmod.quantum_singularity.blackstone", + CuboidMod.MOD_ID + ".quantum_singularity.blackstone", new int[]{0x3C3947, 0x160F10}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "carbon_nanotube"), - "cuboidmod.quantum_singularity.carbon_nanotube", + CuboidMod.MOD_ID + ".quantum_singularity.carbon_nanotube", new int[]{0x877787, 0x554A55}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "cellulose"), - "cuboidmod.quantum_singularity.cellulose", + CuboidMod.MOD_ID + ".quantum_singularity.cellulose", new int[]{0xC8C0A7, 0xF3E8C8}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "clay"), - "cuboidmod.quantum_singularity.clay", + CuboidMod.MOD_ID + ".quantum_singularity.clay", new int[] { 0xAFB9D6, 0x9499A4 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "coal"), - "cuboidmod.quantum_singularity.coal", + CuboidMod.MOD_ID + ".quantum_singularity.coal", new int[] { 0x292828, 0x050505 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "cobblestone"), - "cuboidmod.quantum_singularity.cobblestone", + CuboidMod.MOD_ID + ".quantum_singularity.cobblestone", new int[] { 0xB5B5B5, 0x525252 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "diorite"), - "cuboidmod.quantum_singularity.diorite", + CuboidMod.MOD_ID + ".quantum_singularity.diorite", new int[]{0xE9E9E9, 0x8B8B8B}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "dirt"), - "cuboidmod.quantum_singularity.dirt", + CuboidMod.MOD_ID + ".quantum_singularity.dirt", new int[] { 0xB9855C, 0x593D29 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "dust"), - "cuboidmod.quantum_singularity.dust", + CuboidMod.MOD_ID + ".quantum_singularity.dust", new int[] { 0xF3E8C8, 0xC8C0A7 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "glowstone"), - "cuboidmod.quantum_singularity.glowstone", + CuboidMod.MOD_ID + ".quantum_singularity.glowstone", new int[] { 0xFBDA74, 0xCC8654 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "granite"), - "cuboidmod.quantum_singularity.granite", + CuboidMod.MOD_ID + ".quantum_singularity.granite", new int[] { 0xC99781, 0x7F5646 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "gravel"), - "cuboidmod.quantum_singularity.gravel", + CuboidMod.MOD_ID + ".quantum_singularity.gravel", new int[] { 0xa5a5a5, 0x797979 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "kudbebedda"), - "cuboidmod.quantum_singularity.kudbebedda", + CuboidMod.MOD_ID + ".quantum_singularity.kudbebedda", new int[] { 0x8cd4c0, 0x72b09f }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "lapis"), - "cuboidmod.quantum_singularity.lapis", + CuboidMod.MOD_ID + ".quantum_singularity.lapis", new int[] { 0x20509C, 0x1B3588 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "acacia_log"), - "cuboidmod.quantum_singularity.acacia_log", + CuboidMod.MOD_ID + ".quantum_singularity.acacia_log", new int[] { 0xC26D3F, 0x99502B }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "birch_log"), - "cuboidmod.quantum_singularity.birch_log", + CuboidMod.MOD_ID + ".quantum_singularity.birch_log", new int[] { 0xD7CB8D, 0xA59467 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "dark_oak_log"), - "cuboidmod.quantum_singularity.dark_oak_log", + CuboidMod.MOD_ID + ".quantum_singularity.dark_oak_log", new int[] { 0x53381A, 0x301E0E }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "jungle_log"), - "cuboidmod.quantum_singularity.jungle_log", + CuboidMod.MOD_ID + ".quantum_singularity.jungle_log", new int[] { 0xBF8E6B, 0x976A44 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "oak_log"), - "cuboidmod.quantum_singularity.oak_log", + CuboidMod.MOD_ID + ".quantum_singularity.oak_log", new int[] { 0xC29D62, 0x967441 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "spruce_log"), - "cuboidmod.quantum_singularity.spruce_log", + CuboidMod.MOD_ID + ".quantum_singularity.spruce_log", new int[] { 0x886539, 0x614B2E }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "notarfbadium"), - "cuboidmod.quantum_singularity.notarfbadium", + CuboidMod.MOD_ID + ".quantum_singularity.notarfbadium", new int[] { 0xa1d6bf, 0x79a391 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "notsogudium"), - "cuboidmod.quantum_singularity.notsogudium", + CuboidMod.MOD_ID + ".quantum_singularity.notsogudium", new int[] { 0x9de0d9, 0x7db5af }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "redstone"), - "cuboidmod.quantum_singularity.redstone", + CuboidMod.MOD_ID + ".quantum_singularity.redstone", new int[] { 0xE62008, 0x730C00 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "sand"), - "cuboidmod.quantum_singularity.sand", + CuboidMod.MOD_ID + ".quantum_singularity.sand", new int[] { 0xE3DBB0, 0xD1BA8A }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "silica_dust"), - "cuboidmod.quantum_singularity.silica_dust", + CuboidMod.MOD_ID + ".quantum_singularity.silica_dust", new int[]{0xC8C0A7, 0xF3E8C8}), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "thatldu"), - "cuboidmod.quantum_singularity.thatldu", + CuboidMod.MOD_ID + ".quantum_singularity.thatldu", new int[] { 0x50a142, 0x6bdb58 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "wikidium"), - "cuboidmod.quantum_singularity.wikidium", + CuboidMod.MOD_ID + ".quantum_singularity.wikidium", new int[] { 0x9ed9ac, 0x67b579 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "endstone"), - "cuboidmod.quantum_singularity.endstone", + CuboidMod.MOD_ID + ".quantum_singularity.endstone", new int[] { 0xCDC68B, 0xEEF6B4 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "netherrack"), - "cuboidmod.quantum_singularity.netherrack", + CuboidMod.MOD_ID + ".quantum_singularity.netherrack", new int[] { 0x501B1B, 0x854242 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "zinc"), - "cuboidmod.quantum_singularity.zinc", + CuboidMod.MOD_ID + ".quantum_singularity.zinc", new int[] { 0xB5D1BA, 0x6F7262 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "tin"), - "cuboidmod.quantum_singularity.tin", + CuboidMod.MOD_ID + ".quantum_singularity.tin", new int[] { 0xA1C6C2, 0x517C88 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "copper"), - "cuboidmod.quantum_singularity.copper", + CuboidMod.MOD_ID + ".quantum_singularity.copper", new int[] { 0xF4AD5B, 0xB44816 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "nickel"), - "cuboidmod.quantum_singularity.nickel", + CuboidMod.MOD_ID + ".quantum_singularity.nickel", new int[] { 0xE7D498, 0x997857 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "silver"), - "cuboidmod.quantum_singularity.silver", + CuboidMod.MOD_ID + ".quantum_singularity.silver", new int[] { 0xCEDCE2, 0x8593A2 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "aluminium"), - "cuboidmod.quantum_singularity.aluminium", + CuboidMod.MOD_ID + ".quantum_singularity.aluminium", new int[] { 0xE0F5F3, 0xA1B0AF }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "iron"), - "cuboidmod.quantum_singularity.iron", + CuboidMod.MOD_ID + ".quantum_singularity.iron", new int[] { 0xECECEC, 0xB1B0B0 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "gold"), - "cuboidmod.quantum_singularity.gold", + CuboidMod.MOD_ID + ".quantum_singularity.gold", new int[] { 0xFEFFBD, 0xF9BD23 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "lead"), - "cuboidmod.quantum_singularity.lead", + CuboidMod.MOD_ID + ".quantum_singularity.lead", new int[] { 0x7D97A6, 0x393C61 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "uranium"), - "cuboidmod.quantum_singularity.uranium", + CuboidMod.MOD_ID + ".quantum_singularity.uranium", new int[] { 0x3C853C, 0x285028 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "uraninite"), - "cuboidmod.quantum_singularity.uraninite", + CuboidMod.MOD_ID + ".quantum_singularity.uraninite", new int[] { 0x4CD54C, 0x48A048 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "osmium"), - "cuboidmod.quantum_singularity.osmium", + CuboidMod.MOD_ID + ".quantum_singularity.osmium", new int[] { 0xCAE4E0, 0x9FB1C2 }), - new QuantumSingularity( - new ResourceLocation(CuboidMod.MOD_ID, "cobalt"), - "cuboidmod.quantum_singularity.cobalt", - new int[] { 0x59A6EF, 0x0753B8 }), - new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "diamond"), - "cuboidmod.quantum_singularity.diamond", + CuboidMod.MOD_ID + ".quantum_singularity.diamond", new int[] { 0xb9f4fa, 0x39a7bd }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "emerald"), - "cuboidmod.quantum_singularity.emerald", + CuboidMod.MOD_ID + ".quantum_singularity.emerald", new int[] { 0x4bf253, 0x04c70d }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "steel"), - "cuboidmod.quantum_singularity.steel", + CuboidMod.MOD_ID + ".quantum_singularity.steel", new int[] { 0xababab, 0x878a87 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "bronze"), - "cuboidmod.quantum_singularity.bronze", + CuboidMod.MOD_ID + ".quantum_singularity.bronze", new int[] { 0xe0b43a, 0xa37a07 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "electrum"), - "cuboidmod.quantum_singularity.electrum", + CuboidMod.MOD_ID + ".quantum_singularity.electrum", new int[] { 0xe6da6e, 0xf0d046 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "invar"), - "cuboidmod.quantum_singularity.invar", + CuboidMod.MOD_ID + ".quantum_singularity.invar", new int[] { 0xa6b6ba, 0x778487 }), new QuantumSingularity( new ResourceLocation(CuboidMod.MOD_ID, "platinum"), - "cuboidmod.quantum_singularity.platinum", + CuboidMod.MOD_ID + ".quantum_singularity.platinum", new int[] { 0x90aba6, 0xccf0ea }) ); } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/KudbebeddaQuantumCollapserTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/KudbebeddaQuantumCollapserTileEntity.java index 8dba21f..a1b2206 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/KudbebeddaQuantumCollapserTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/KudbebeddaQuantumCollapserTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.collapser.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.inventory.KudbebeddaQuantumCollapserContainer; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import net.minecraft.world.entity.player.Player; @@ -24,7 +25,7 @@ public KudbebeddaQuantumCollapserTileEntity(BlockPos pos, BlockState state) { @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.kudbebedda_quantum_collapser"); + return Component.translatable(CuboidMod.MOD_ID + ".container.kudbebedda_quantum_collapser"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotarfbadiumQuantumCollapserTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotarfbadiumQuantumCollapserTileEntity.java index 05d428c..1b7c2e5 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotarfbadiumQuantumCollapserTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotarfbadiumQuantumCollapserTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.collapser.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.inventory.NotarfbadiumQuantumCollapserContainer; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import net.minecraft.world.entity.player.Player; @@ -24,7 +25,7 @@ public NotarfbadiumQuantumCollapserTileEntity(BlockPos pos, BlockState state) { @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.notarfbadium_quantum_collapser"); + return Component.translatable(CuboidMod.MOD_ID + ".container.notarfbadium_quantum_collapser"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotsogudiumQuantumCollapserTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotsogudiumQuantumCollapserTileEntity.java index b163894..b3cd680 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotsogudiumQuantumCollapserTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/NotsogudiumQuantumCollapserTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.collapser.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.inventory.NotsogudiumQuantumCollapserContainer; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import net.minecraft.world.entity.player.Player; @@ -24,7 +25,7 @@ public NotsogudiumQuantumCollapserTileEntity(BlockPos pos, BlockState state) { @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.notsogudium_quantum_collapser"); + return Component.translatable(CuboidMod.MOD_ID + ".container.notsogudium_quantum_collapser"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/ThatlduQuantumCollapserTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/ThatlduQuantumCollapserTileEntity.java index bed1708..efbeb42 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/ThatlduQuantumCollapserTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/ThatlduQuantumCollapserTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.collapser.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.inventory.ThatlduQuantumCollapserContainer; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import net.minecraft.world.entity.player.Player; @@ -24,7 +25,7 @@ public ThatlduQuantumCollapserTileEntity(BlockPos pos, BlockState state) { @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.thatldu_quantum_collapser"); + return Component.translatable(CuboidMod.MOD_ID + ".container.thatldu_quantum_collapser"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/WikidiumQuantumCollapserTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/WikidiumQuantumCollapserTileEntity.java index f6e3ae9..590d46d 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/WikidiumQuantumCollapserTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/tile/WikidiumQuantumCollapserTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.collapser.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.collapser.inventory.WikidiumQuantumCollapserContainer; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import net.minecraft.world.entity.player.Player; @@ -24,7 +25,7 @@ public WikidiumQuantumCollapserTileEntity(BlockPos pos, BlockState state) { @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.wikidium_quantum_collapser"); + return Component.translatable(CuboidMod.MOD_ID + ".container.wikidium_quantum_collapser"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/block/DryingCupboardBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/block/DryingCupboardBlock.java index 51aa9d0..7b725c7 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/block/DryingCupboardBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/block/DryingCupboardBlock.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.dryingcupboard.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.dryingcupboard.tile.DryingCupboardTileEntity; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -50,7 +51,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.drying_cupboard")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.drying_cupboard")); } @Nullable diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/tile/DryingCupboardTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/tile/DryingCupboardTileEntity.java index 6de7c90..f0a9afc 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/tile/DryingCupboardTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/dryingcupboard/tile/DryingCupboardTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.dryingcupboard.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.dryingcupboard.inventory.DryingCupboardContainer; import com.cuboiddroid.cuboidmod.modules.dryingcupboard.recipe.DryingRecipe; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -78,7 +79,7 @@ public DryingCupboardTileEntity(BlockPos pos, BlockState state) { } public Component getDisplayName() { - return Component.translatable("cuboidmod.container.drying_cupboard"); + return Component.translatable(CuboidMod.MOD_ID + ".container.drying_cupboard"); } public static void gameTick(Level level, BlockPos worldPosition, BlockState blockState, DryingCupboardTileEntity entity) { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/AppleCiderVinegarItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/AppleCiderVinegarItem.java index a3f8a1e..958f48f 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/AppleCiderVinegarItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/AppleCiderVinegarItem.java @@ -35,6 +35,6 @@ public AppleCiderVinegarItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.apple_cider_vinegar.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".apple_cider_vinegar.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/BeefBiltongItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/BeefBiltongItem.java index 11839cb..d369776 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/BeefBiltongItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/BeefBiltongItem.java @@ -31,6 +31,6 @@ public BeefBiltongItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.biltong_beef.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".biltong_beef.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredBeefItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredBeefItem.java index 1da03f5..f3959b4 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredBeefItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredBeefItem.java @@ -31,6 +31,6 @@ public CuredBeefItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.cured_beef.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".cured_beef.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredFleshItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredFleshItem.java index 4096ae7..1537fe1 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredFleshItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/CuredFleshItem.java @@ -31,6 +31,6 @@ public CuredFleshItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.cured_flesh.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".cured_flesh.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/HardfiskurItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/HardfiskurItem.java index 96d7a92..d360fa8 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/HardfiskurItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/HardfiskurItem.java @@ -31,6 +31,6 @@ public HardfiskurItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.hardfiskur.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".hardfiskur.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/RationPackItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/RationPackItem.java index b309c5a..a46842b 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/RationPackItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/RationPackItem.java @@ -28,6 +28,6 @@ public RationPackItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.ration_pack.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".ration_pack.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/ZombieBiltongItem.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/ZombieBiltongItem.java index 70db0b2..b54bf4a 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/food/ZombieBiltongItem.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/food/ZombieBiltongItem.java @@ -31,6 +31,6 @@ public ZombieBiltongItem() { @Override public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag flag) { - list.add(Component.translatable("item.cuboidmod.biltong_zombie.hover_text")); + list.add(Component.translatable("item." + CuboidMod.MOD_ID + ".biltong_zombie.hover_text")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/EumusFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/EumusFurnaceTileEntity.java index efefe3a..093ae82 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/EumusFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/EumusFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.EumusFurnaceContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.eumus_furnace"; + return CuboidMod.MOD_ID + ".container.eumus_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/KudbebeddaFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/KudbebeddaFurnaceTileEntity.java index 8ce5ff5..ce30ea0 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/KudbebeddaFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/KudbebeddaFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.KudbebeddaFurnaceContainer; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.kudbebedda_furnace"; + return CuboidMod.MOD_ID + ".container.kudbebedda_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotarfbadiumFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotarfbadiumFurnaceTileEntity.java index e18b33d..6623230 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotarfbadiumFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotarfbadiumFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.NotarfbadiumFurnaceContainer; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.notarfbadium_furnace"; + return CuboidMod.MOD_ID + ".container.notarfbadium_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotsogudiumFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotsogudiumFurnaceTileEntity.java index 5290fd4..c726a81 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotsogudiumFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/NotsogudiumFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.NotsogudiumFurnaceContainer; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.notsogudium_furnace"; + return CuboidMod.MOD_ID + ".container.notsogudium_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/ThatlduFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/ThatlduFurnaceTileEntity.java index fa4937d..f884105 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/ThatlduFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/ThatlduFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.ThatlduFurnaceContainer; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.thatldu_furnace"; + return CuboidMod.MOD_ID + ".container.thatldu_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/WikidiumFurnaceTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/WikidiumFurnaceTileEntity.java index b5c912c..82b7099 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/WikidiumFurnaceTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/furnace/tile/WikidiumFurnaceTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.furnace.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; import com.cuboiddroid.cuboidmod.modules.furnace.inventory.WikidiumFurnaceContainer; @@ -27,7 +28,7 @@ protected ForgeConfigSpec.IntValue getCookTimeConfig() { @Override public String IgetName() { - return "cuboidmod.container.wikidium_furnace"; + return CuboidMod.MOD_ID + ".container.wikidium_furnace"; } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/block/SingularityPowerGeneratorBlockBase.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/block/SingularityPowerGeneratorBlockBase.java index 9f7016f..2ad69aa 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/block/SingularityPowerGeneratorBlockBase.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/block/SingularityPowerGeneratorBlockBase.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.tile.SingularityPowerGeneratorTileEntityBase; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.BaseEntityBlock; @@ -100,7 +101,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.singularity_power_generator")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.singularity_power_generator")); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/KudbebeddaSingularityPowerGeneratorScreen.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/KudbebeddaSingularityPowerGeneratorScreen.java index da643f7..4f11542 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/KudbebeddaSingularityPowerGeneratorScreen.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/KudbebeddaSingularityPowerGeneratorScreen.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.screen; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.inventory.KudbebeddaSingularityPowerGeneratorContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; @@ -15,6 +16,6 @@ public KudbebeddaSingularityPowerGeneratorScreen(KudbebeddaSingularityPowerGener inv, name != null ? name - : Component.translatable("cuboidmod.container.kudbebedda_singularity_power_generator")); + : Component.translatable(CuboidMod.MOD_ID + ".container.kudbebedda_singularity_power_generator")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotarfbadiumSingularityPowerGeneratorScreen.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotarfbadiumSingularityPowerGeneratorScreen.java index 3736812..e746b7a 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotarfbadiumSingularityPowerGeneratorScreen.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotarfbadiumSingularityPowerGeneratorScreen.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.screen; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.inventory.NotarfbadiumSingularityPowerGeneratorContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; @@ -15,6 +16,6 @@ public NotarfbadiumSingularityPowerGeneratorScreen(NotarfbadiumSingularityPowerG inv, name != null ? name - : Component.translatable("cuboidmod.container.notarfbadium_singularity_power_generator")); + : Component.translatable(CuboidMod.MOD_ID + ".container.notarfbadium_singularity_power_generator")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotsogudiumSingularityPowerGeneratorScreen.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotsogudiumSingularityPowerGeneratorScreen.java index 981b893..5c105e8 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotsogudiumSingularityPowerGeneratorScreen.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/NotsogudiumSingularityPowerGeneratorScreen.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.screen; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.inventory.NotsogudiumSingularityPowerGeneratorContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; @@ -15,6 +16,6 @@ public NotsogudiumSingularityPowerGeneratorScreen(NotsogudiumSingularityPowerGen inv, name != null ? name - : Component.translatable("cuboidmod.container.notsogudium_singularity_power_generator")); + : Component.translatable(CuboidMod.MOD_ID + ".container.notsogudium_singularity_power_generator")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/ThatlduSingularityPowerGeneratorScreen.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/ThatlduSingularityPowerGeneratorScreen.java index e707b35..c111e17 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/ThatlduSingularityPowerGeneratorScreen.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/ThatlduSingularityPowerGeneratorScreen.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.screen; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.inventory.ThatlduSingularityPowerGeneratorContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; @@ -15,6 +16,6 @@ public ThatlduSingularityPowerGeneratorScreen(ThatlduSingularityPowerGeneratorCo inv, name != null ? name - : Component.translatable("cuboidmod.container.thatldu_singularity_power_generator")); + : Component.translatable(CuboidMod.MOD_ID + ".container.thatldu_singularity_power_generator")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/WikidiumSingularityPowerGeneratorScreen.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/WikidiumSingularityPowerGeneratorScreen.java index f0ab673..527d082 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/WikidiumSingularityPowerGeneratorScreen.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/screen/WikidiumSingularityPowerGeneratorScreen.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.powergen.screen; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.powergen.inventory.WikidiumSingularityPowerGeneratorContainer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.network.chat.Component; @@ -15,6 +16,6 @@ public WikidiumSingularityPowerGeneratorScreen(WikidiumSingularityPowerGenerator inv, name != null ? name - : Component.translatable("cuboidmod.container.wikidium_singularity_power_generator")); + : Component.translatable(CuboidMod.MOD_ID + ".container.wikidium_singularity_power_generator")); } } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/KudbebeddaSingularityPowerGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/KudbebeddaSingularityPowerGeneratorTileEntity.java index f53db63..b0bfc1c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/KudbebeddaSingularityPowerGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/KudbebeddaSingularityPowerGeneratorTileEntity.java @@ -28,7 +28,7 @@ public KudbebeddaSingularityPowerGeneratorTileEntity(BlockPos pos, BlockState st @Override public Component getDisplayName() { - return null; + return Component.translatable("cuboidmod.container.kudbebedda_singularity_power_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotarfbadiumSingularityPowerGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotarfbadiumSingularityPowerGeneratorTileEntity.java index 3e1ac31..8bd1651 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotarfbadiumSingularityPowerGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotarfbadiumSingularityPowerGeneratorTileEntity.java @@ -28,7 +28,7 @@ public NotarfbadiumSingularityPowerGeneratorTileEntity(BlockPos pos, BlockState @Override public Component getDisplayName() { - return null; + return Component.translatable("cuboidmod.container.notarfbadium_singularity_power_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotsogudiumSingularityPowerGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotsogudiumSingularityPowerGeneratorTileEntity.java index 0c3bf4e..80e9c97 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotsogudiumSingularityPowerGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/NotsogudiumSingularityPowerGeneratorTileEntity.java @@ -28,7 +28,7 @@ public NotsogudiumSingularityPowerGeneratorTileEntity(BlockPos pos, BlockState s @Override public Component getDisplayName() { - return null; + return Component.translatable("cuboidmod.container.notsogudium_singularity_power_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/ThatlduSingularityPowerGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/ThatlduSingularityPowerGeneratorTileEntity.java index 0106c53..d4c15e0 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/ThatlduSingularityPowerGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/ThatlduSingularityPowerGeneratorTileEntity.java @@ -28,7 +28,7 @@ public ThatlduSingularityPowerGeneratorTileEntity(BlockPos pos, BlockState state @Override public Component getDisplayName() { - return null; + return Component.translatable("cuboidmod.container.thatldu_singularity_power_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/WikidiumSingularityPowerGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/WikidiumSingularityPowerGeneratorTileEntity.java index 92dcde6..b2c16e8 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/WikidiumSingularityPowerGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/powergen/tile/WikidiumSingularityPowerGeneratorTileEntity.java @@ -28,7 +28,7 @@ public WikidiumSingularityPowerGeneratorTileEntity(BlockPos pos, BlockState stat @Override public Component getDisplayName() { - return null; + return Component.translatable("cuboidmod.container.wikidium_singularity_power_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/block/MolecularRecyclerBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/block/MolecularRecyclerBlock.java index 92cc3df..7ed7f35 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/block/MolecularRecyclerBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/block/MolecularRecyclerBlock.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.recycler.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.recycler.tile.MolecularRecyclerTileEntity; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -67,7 +68,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.molecular_recycler")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.molecular_recycler")); } @Nullable diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/config/BlacklistConfig.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/config/BlacklistConfig.java index 091665c..c719597 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/config/BlacklistConfig.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/config/BlacklistConfig.java @@ -48,7 +48,7 @@ private BlacklistConfig() public void loadConfig() { Stopwatch stopwatch = Stopwatch.createStarted(); - File dir = FMLPaths.CONFIGDIR.get().resolve("cuboidmod/recycler/").toFile(); + File dir = FMLPaths.CONFIGDIR.get().resolve(CuboidMod.MOD_ID + "/recycler/").toFile(); CuboidMod.LOGGER.info("Loading Molecular Recycler blacklists"); @@ -178,7 +178,7 @@ private ArrayList getDefaultRecipeBlacklist() { ArrayList result = new ArrayList<>(); - result.add("cuboidmod:cured_flesh_from_acv_and_rotten_flesh"); + result.add(CuboidMod.MOD_ID + ":cured_flesh_from_acv_and_rotten_flesh"); return result; } @@ -187,8 +187,8 @@ private ArrayList getDefaultItemBlacklist() { ArrayList result = new ArrayList<>(); - result.add("cuboidmod:cured_beef"); - result.add("cuboidmod:cured_flesh"); + result.add(CuboidMod.MOD_ID + ":cured_beef"); + result.add(CuboidMod.MOD_ID + ":cured_flesh"); result.add("exnihilosequentia:hammer_stone"); return result; diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/tile/MolecularRecyclerTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/tile/MolecularRecyclerTileEntity.java index e444852..4a05dab 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/tile/MolecularRecyclerTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/recycler/tile/MolecularRecyclerTileEntity.java @@ -99,7 +99,7 @@ public MolecularRecyclerTileEntity(BlockPos pos, BlockState state) { } public Component getDisplayName() { - return Component.translatable("cuboidmod.container.molecular_recycler"); + return Component.translatable(CuboidMod.MOD_ID + ".container.molecular_recycler"); } public static void gameTick(Level level, BlockPos worldPosition, BlockState blockState, MolecularRecyclerTileEntity entity) { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/block/RefinedInscriberBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/block/RefinedInscriberBlock.java index 5685298..55ea51f 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/block/RefinedInscriberBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/block/RefinedInscriberBlock.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.refinedinscriber.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.refinedinscriber.tile.RefinedInscriberTileEntity; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -71,7 +72,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.refined_inscriber")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.refined_inscriber")); } @Nullable diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/tile/RefinedInscriberTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/tile/RefinedInscriberTileEntity.java index a95ed1e..08c47e8 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/tile/RefinedInscriberTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/refinedinscriber/tile/RefinedInscriberTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.refinedinscriber.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.refinedinscriber.inventory.RefinedInscriberContainer; import com.cuboiddroid.cuboidmod.modules.refinedinscriber.recipe.InscribingRecipe; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -79,7 +80,7 @@ public RefinedInscriberTileEntity(BlockPos pos, BlockState state) { } public Component getDisplayName() { - return Component.translatable("cuboidmod.container.refined_inscriber"); + return Component.translatable(CuboidMod.MOD_ID + ".container.refined_inscriber"); } public static void gameTick(Level level, BlockPos worldPosition, BlockState blockState, RefinedInscriberTileEntity entity) { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/block/SingularityResourceGeneratorBlockBase.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/block/SingularityResourceGeneratorBlockBase.java index 69aaa7b..b5aaedd 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/block/SingularityResourceGeneratorBlockBase.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/block/SingularityResourceGeneratorBlockBase.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.tile.SingularityResourceGeneratorTileEntityBase; import net.minecraft.world.level.block.BaseEntityBlock; @@ -102,7 +103,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.singularity_resource_generator")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.singularity_resource_generator")); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/KudbebeddaSingularityResourceGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/KudbebeddaSingularityResourceGeneratorTileEntity.java index 1b07569..e03c61d 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/KudbebeddaSingularityResourceGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/KudbebeddaSingularityResourceGeneratorTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.inventory.KudbebeddaSingularityResourceGeneratorContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -27,7 +28,7 @@ public KudbebeddaSingularityResourceGeneratorTileEntity(BlockPos pos, BlockState @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.kudbebedda_singularity_resource_generator"); + return Component.translatable(CuboidMod.MOD_ID + ".container.kudbebedda_singularity_resource_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotarfbadiumSingularityResourceGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotarfbadiumSingularityResourceGeneratorTileEntity.java index 667d0c9..19847a4 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotarfbadiumSingularityResourceGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotarfbadiumSingularityResourceGeneratorTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.inventory.NotarfbadiumSingularityResourceGeneratorContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -27,7 +28,7 @@ public NotarfbadiumSingularityResourceGeneratorTileEntity(BlockPos pos, BlockSta @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.notarfbadium_singularity_resource_generator"); + return Component.translatable(CuboidMod.MOD_ID + ".container.notarfbadium_singularity_resource_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotsogudiumSingularityResourceGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotsogudiumSingularityResourceGeneratorTileEntity.java index 771c1d7..5d368f5 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotsogudiumSingularityResourceGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/NotsogudiumSingularityResourceGeneratorTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.inventory.NotsogudiumSingularityResourceGeneratorContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -27,7 +28,7 @@ public NotsogudiumSingularityResourceGeneratorTileEntity(BlockPos pos, BlockStat @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.notsogudium_singularity_resource_generator"); + return Component.translatable(CuboidMod.MOD_ID + ".container.notsogudium_singularity_resource_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/ThatlduSingularityResourceGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/ThatlduSingularityResourceGeneratorTileEntity.java index 54ecbaf..f02dd3b 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/ThatlduSingularityResourceGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/ThatlduSingularityResourceGeneratorTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.inventory.ThatlduSingularityResourceGeneratorContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -27,7 +28,7 @@ public ThatlduSingularityResourceGeneratorTileEntity(BlockPos pos, BlockState st @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.thatldu_singularity_resource_generator"); + return Component.translatable(CuboidMod.MOD_ID + ".container.thatldu_singularity_resource_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/WikidiumSingularityResourceGeneratorTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/WikidiumSingularityResourceGeneratorTileEntity.java index e273209..a21d0ce 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/WikidiumSingularityResourceGeneratorTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/WikidiumSingularityResourceGeneratorTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.resourcegen.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.resourcegen.inventory.WikidiumSingularityResourceGeneratorContainer; import com.cuboiddroid.cuboidmod.setup.ModBlocks; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -28,7 +29,7 @@ public WikidiumSingularityResourceGeneratorTileEntity(BlockPos pos, BlockState s @Override public Component getDisplayName() { - return Component.translatable("cuboidmod.container.wikidium_singularity_resource_generator"); + return Component.translatable(CuboidMod.MOD_ID + ".container.wikidium_singularity_resource_generator"); } @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/SmasherBase.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/SmasherBase.java index 9171d4a..871ca0d 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/SmasherBase.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/SmasherBase.java @@ -15,6 +15,9 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; + +import com.cuboiddroid.cuboidmod.CuboidMod; + import java.util.List; import net.minecraft.world.item.crafting.RecipeType; @@ -59,6 +62,6 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) { @Override public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - tooltip.add((Component.translatable("hover_text.cuboidmod.smasher").withStyle(ChatFormatting.GREEN))); + tooltip.add((Component.translatable("hover_text." + CuboidMod.MOD_ID + ".smasher").withStyle(ChatFormatting.GREEN))); } } \ No newline at end of file diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/ToolUtils.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/ToolUtils.java index 256058f..a5087d9 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/ToolUtils.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/tools/ToolUtils.java @@ -70,7 +70,7 @@ public static Boolean isBreakableWithSmasher(Level world, BlockPos pos, Player p public static HitResult calcRayTrace(Level worldIn, Player player, ClipContext.Fluid fluidMode) { float f = player.getRotationVector().x; - float f1 = player.getRotationVector().x; + float f1 = player.getRotationVector().y; Vec3 vec3d = player.getEyePosition(1.0F); float f2 = Mth.cos(-f1 * ((float) Math.PI / 180F) - (float) Math.PI); float f3 = Mth.sin(-f1 * ((float) Math.PI / 180F) - (float) Math.PI); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/block/QuantumTransmutationChamberBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/block/QuantumTransmutationChamberBlock.java index 029f59b..6bbaa5c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/block/QuantumTransmutationChamberBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/block/QuantumTransmutationChamberBlock.java @@ -1,5 +1,6 @@ package com.cuboiddroid.cuboidmod.modules.transmuter.block; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.transmuter.tile.QuantumTransmutationChamberTileEntity; import com.cuboiddroid.cuboidmod.setup.ModTileEntities; @@ -82,7 +83,7 @@ public RenderShape getRenderShape(BlockState p_49232_) { @Override public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List list, TooltipFlag flags) { - list.add(Component.translatable("cuboidmod.hover_text.quantum_transmutation_chamber")); + list.add(Component.translatable(CuboidMod.MOD_ID + ".hover_text.quantum_transmutation_chamber")); } @Nullable diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/tile/QuantumTransmutationChamberTileEntity.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/tile/QuantumTransmutationChamberTileEntity.java index d3a7954..c8d34e1 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/tile/QuantumTransmutationChamberTileEntity.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/transmuter/tile/QuantumTransmutationChamberTileEntity.java @@ -1,6 +1,7 @@ package com.cuboiddroid.cuboidmod.modules.transmuter.tile; import com.cuboiddroid.cuboidmod.Config; +import com.cuboiddroid.cuboidmod.CuboidMod; import com.cuboiddroid.cuboidmod.modules.transmuter.inventory.QuantumTransmutationChamberContainer; import com.cuboiddroid.cuboidmod.modules.transmuter.recipe.TransmutingRecipe; import com.cuboiddroid.cuboidmod.setup.ModBlocks; @@ -78,7 +79,7 @@ public QuantumTransmutationChamberTileEntity(BlockPos pos, BlockState state) { } public Component getDisplayName() { - return Component.translatable("cuboidmod.container.quantum_transmutation_chamber"); + return Component.translatable(CuboidMod.MOD_ID + ".container.quantum_transmutation_chamber"); } public static void gameTick(Level level, BlockPos worldPosition, BlockState blockState, QuantumTransmutationChamberTileEntity entity) { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/xmas/block/FiberOpticTreeBlock.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/xmas/block/FiberOpticTreeBlock.java index 6b0a37d..a3a8672 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/xmas/block/FiberOpticTreeBlock.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/xmas/block/FiberOpticTreeBlock.java @@ -51,7 +51,7 @@ public FiberOpticTreeBlock() { @Override public void appendHoverText(ItemStack itemStack, @Nullable BlockGetter reader, List list, TooltipFlag flag) { - list.add(Component.translatable("block.cuboidmod.fiber_optic_tree.hover_text")); + list.add(Component.translatable("block." + CuboidMod.MOD_ID + ".fiber_optic_tree.hover_text")); } // @Override diff --git a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModCreativeTabs.java b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModCreativeTabs.java index 4137008..aef7425 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModCreativeTabs.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModCreativeTabs.java @@ -1,16 +1,19 @@ package com.cuboiddroid.cuboidmod.setup; import net.minecraft.world.item.ItemStack; + +import com.cuboiddroid.cuboidmod.CuboidMod; + import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.minecraftforge.registries.RegistryObject; public class ModCreativeTabs { - public static final RegistryObject CUBOIDMOD_ITEM_GROUP = Registration.TAB.register("cuboidmod", () -> CreativeModeTab + public static final RegistryObject CUBOIDMOD_ITEM_GROUP = Registration.TAB.register(CuboidMod.MOD_ID, () -> CreativeModeTab .builder().icon(() -> new ItemStack(ModBlocks.THATLDU_BLOCK.get())) .displayItems((params, output) -> Registration.ITEMS.getEntries().forEach(item -> output.accept(item.get()))) - .title(Component.translatable("itemGroup.cuboidmod")) + .title(Component.translatable("itemGroup." + CuboidMod.MOD_ID)) .build()); static void register() { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java index 14f82de..7db2a2d 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java @@ -479,9 +479,6 @@ public class ModItems { public static final RegistryObject ZINC_DUST = Registration.ITEMS.register( "zinc_dust", () -> new Item(new Item.Properties())); - public static final RegistryObject COBALT_DUST = Registration.ITEMS.register( - "cobalt_dust", () -> new Item(new Item.Properties())); - // Carbon Deposit public static final RegistryObject CARBON_DEPOSIT = Registration.ITEMS.register( "carbon_deposit", () -> new Item(new Item.Properties())); @@ -686,9 +683,6 @@ public class ModItems { public static final RegistryObject OSMIUM_QUANTUM_SINGULARITY = Registration.ITEMS.register( "osmium_quantum_singularity", OsmiumQuantumSingularityItem::new); - public static final RegistryObject COBALT_QUANTUM_SINGULARITY = Registration.ITEMS.register( - "cobalt_quantum_singularity", CobaltQuantumSingularityItem::new); - public static final RegistryObject DIAMOND_QUANTUM_SINGULARITY = Registration.ITEMS.register( "diamond_quantum_singularity", DiamondQuantumSingularityItem::new); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java index 2a91c5c..6dbb991 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java @@ -179,7 +179,6 @@ public static final class Items { // additional dusts public static final TagKey DUSTS_ZINC = forge("dusts/zinc"); - public static final TagKey DUSTS_COBALT = forge("dusts/cobalt"); // salt public static final TagKey DUSTS_SALT = forge("dusts/salt"); @@ -270,7 +269,6 @@ public static final class Items { public static final TagKey QUANTUM_SINGULARITIES_URANIUM = mod("quantum_singularities/uranium"); public static final TagKey QUANTUM_SINGULARITIES_URANINITE = mod("quantum_singularities/uraninite"); public static final TagKey QUANTUM_SINGULARITIES_OSMIUM = mod("quantum_singularities/osmium"); - public static final TagKey QUANTUM_SINGULARITIES_COBALT = mod("quantum_singularities/cobalt"); public static final TagKey QUANTUM_SINGULARITIES_DIAMOND = mod("quantum_singularities/diamond"); public static final TagKey QUANTUM_SINGULARITIES_EMERALD = mod("quantum_singularities/emerald"); diff --git a/src/main/resources/assets/cuboidmod/lang/en_us.json b/src/main/resources/assets/cuboidmod/lang/en_us.json index 08be58c..682fe67 100644 --- a/src/main/resources/assets/cuboidmod/lang/en_us.json +++ b/src/main/resources/assets/cuboidmod/lang/en_us.json @@ -102,7 +102,6 @@ "block.cuboidmod.silica_dust_block": "Block of Silica Dust", "item.cuboidmod.salt": "Salt", "item.cuboidmod.zinc_dust": "Zinc Dust", - "item.cuboidmod.cobalt_dust": "Cobalt Dust", "item.cuboidmod.carbon_deposit": "Carbon Deposit", "item.cuboidmod.carbon_nanotube": "Carbon Nanotubes", "block.cuboidmod.carbon_nanotube_block": "Block of Carbon Nanotubes", @@ -260,7 +259,6 @@ "cuboidmod.quantum_singularity.uranium": "Uranium Quantum Singularity", "cuboidmod.quantum_singularity.uraninite": "Uraninite Quantum Singularity", "cuboidmod.quantum_singularity.osmium": "Osmium Quantum Singularity", - "cuboidmod.quantum_singularity.cobalt": "Cobalt Quantum Singularity", "cuboidmod.quantum_singularity.diamond": "Diamond Quantum Singularity", "cuboidmod.quantum_singularity.emerald": "Emerald Quantum Singularity", diff --git a/src/main/resources/data/cuboidmod/recipes/qc_cobalt_qs.json b/src/main/resources/data/cuboidmod/recipes/qc_cobalt_qs.json deleted file mode 100644 index 3ab9173..0000000 --- a/src/main/resources/data/cuboidmod/recipes/qc_cobalt_qs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "cuboidmod:collapsing", - "input": { - "tag": "forge:ingots/cobalt", - "count": 160 - }, - "result": { - "item": "cuboidmod:cobalt_quantum_singularity", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/cuboidmod/recipes/srg_aluminium.json b/src/main/resources/data/cuboidmod/recipes/srg_aluminium.json index fb095ce..da5d59e 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_aluminium.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_aluminium.json @@ -4,7 +4,7 @@ "item": "cuboidmod:aluminium_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_aluminum" + "item": "exnihilosequentia:raw_aluminum" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_cobalt.json b/src/main/resources/data/cuboidmod/recipes/srg_cobalt.json deleted file mode 100644 index 22c5e6c..0000000 --- a/src/main/resources/data/cuboidmod/recipes/srg_cobalt.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "cuboidmod:resource_generating", - "singularity": { - "item": "cuboidmod:cobalt_quantum_singularity" - }, - "result": { - "item": "exnihilosequentia:chunk_cobalt" - }, - "work_time_multiplier": 4.0, - "output_multiplier": 0.25 -} \ No newline at end of file diff --git a/src/main/resources/data/cuboidmod/recipes/srg_copper.json b/src/main/resources/data/cuboidmod/recipes/srg_copper.json index 5ac495a..95fdd71 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_copper.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_copper.json @@ -4,7 +4,7 @@ "item": "cuboidmod:copper_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_copper" + "item": "minecraft:raw_copper" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_gold.json b/src/main/resources/data/cuboidmod/recipes/srg_gold.json index 7f654a4..a3c23e1 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_gold.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_gold.json @@ -4,7 +4,7 @@ "item": "cuboidmod:gold_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_gold" + "item": "minecraft:raw_gold" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_iron.json b/src/main/resources/data/cuboidmod/recipes/srg_iron.json index 31b4d5b..2fec5c0 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_iron.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_iron.json @@ -4,7 +4,7 @@ "item": "cuboidmod:iron_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_iron" + "item": "minecraft:raw_iron" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_lead.json b/src/main/resources/data/cuboidmod/recipes/srg_lead.json index 1a91da3..8f7e0f7 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_lead.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_lead.json @@ -4,7 +4,7 @@ "item": "cuboidmod:lead_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_lead" + "item": "exnihilosequentia:raw_lead" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_nickel.json b/src/main/resources/data/cuboidmod/recipes/srg_nickel.json index 80f3e45..248d37c 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_nickel.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_nickel.json @@ -4,7 +4,7 @@ "item": "cuboidmod:nickel_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_nickel" + "item": "exnihilosequentia:raw_nickel" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_osmium.json b/src/main/resources/data/cuboidmod/recipes/srg_osmium.json index b46f982..ca6c398 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_osmium.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_osmium.json @@ -4,7 +4,7 @@ "item": "cuboidmod:osmium_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_osmium" + "item": "mekanism:raw_osmium" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_platinum.json b/src/main/resources/data/cuboidmod/recipes/srg_platinum.json index 2f1fc5d..bf92fe5 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_platinum.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_platinum.json @@ -4,7 +4,7 @@ "item": "cuboidmod:platinum_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_platinum" + "item": "exnihilosequentia:raw_platinum" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_silver.json b/src/main/resources/data/cuboidmod/recipes/srg_silver.json index 0622f6a..31146e7 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_silver.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_silver.json @@ -4,7 +4,7 @@ "item": "cuboidmod:silver_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_silver" + "item": "exnihilosequentia:raw_silver" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_tin.json b/src/main/resources/data/cuboidmod/recipes/srg_tin.json index 69f9edc..300f1c4 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_tin.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_tin.json @@ -4,7 +4,7 @@ "item": "cuboidmod:tin_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_tin" + "item": "exnihilosequentia:raw_tin" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_uraninite.json b/src/main/resources/data/cuboidmod/recipes/srg_uraninite.json index 9c4b2a7..a68412b 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_uraninite.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_uraninite.json @@ -4,7 +4,7 @@ "item": "cuboidmod:uraninite_quantum_singularity" }, "result": { - "item": "powah:uraninite_raw_poor" + "item": "powah:uraninite_raw" }, "work_time_multiplier": 6.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_uranium.json b/src/main/resources/data/cuboidmod/recipes/srg_uranium.json index 8b35e43..cfab7d7 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_uranium.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_uranium.json @@ -4,7 +4,7 @@ "item": "cuboidmod:uranium_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_uranium" + "item": "exnihilosequentia:raw_uranium" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25 diff --git a/src/main/resources/data/cuboidmod/recipes/srg_zinc.json b/src/main/resources/data/cuboidmod/recipes/srg_zinc.json index 8d05410..7f4a73e 100644 --- a/src/main/resources/data/cuboidmod/recipes/srg_zinc.json +++ b/src/main/resources/data/cuboidmod/recipes/srg_zinc.json @@ -4,7 +4,7 @@ "item": "cuboidmod:zinc_quantum_singularity" }, "result": { - "item": "exnihilosequentia:chunk_zinc" + "item": "exnihilosequentia:raw_zinc" }, "work_time_multiplier": 4.0, "output_multiplier": 0.25