diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index f91519a2a..c2cef6dde 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -117,7 +117,6 @@ public class TechReborn implements ModInitializer { proxy.postInit(); - ModRecipes.postInit(); CommandRegistry.INSTANCE.register(false, dispatcher -> dispatcher.register(CommandManager.literal("recipe").executes(context -> { try { diff --git a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java index e18734834..711c4ae01 100644 --- a/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiAlloyFurnace.java @@ -66,7 +66,7 @@ public class GuiAlloyFurnace extends AbstractContainerScreen { @Override protected void drawForeground(final int p_146979_1_, final int p_146979_2_) { - final String name = I18n.translate("blockEntity.techreborn.iron_alloy_furnace.name"); + final String name = I18n.translate("block.techreborn.iron_alloy_furnace"); this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6, 4210752); this.font.draw(I18n.translate("container.inventory", new Object[0]), 8, diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 60deb9fd1..928d177d3 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -29,7 +29,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index aa76fcabe..bbdf62ffc 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -31,10 +31,11 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; import net.minecraft.util.Identifier; +import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.widget.GuiButtonSimple; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; -public class GuiChunkLoader extends AbstractContainerScreen { +public class GuiChunkLoader extends AbstractContainerScreen { private static final Identifier texture = new Identifier("techreborn", "textures/gui/industrial_chunkloader.png"); @@ -80,7 +81,7 @@ public class GuiChunkLoader extends AbstractContainerScreen { @Override protected void drawForeground(final int p_146979_1_, final int p_146979_2_) { - final String name = I18n.translate("blockEntity.techreborn:chunk_loader.name"); + final String name = I18n.translate("block.techreborn.chunk_loader"); this.font.draw(name, this.containerWidth / 2 - this.font.getStringWidth(name) / 2, 6, 4210752); this.font.draw(I18n.translate("container.inventory", new Object[0]), 8, diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index c17818c0c..990efb262 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -29,7 +29,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 993e1c82d..280a9c9e4 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -28,7 +28,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 06b796751..380f6a20f 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -29,7 +29,6 @@ import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.tuple.Pair; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 26ae2b7b8..3b6fe31f5 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -28,7 +28,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index d6d884180..f826e905e 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -29,7 +29,6 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 5e1628cee..c2984d596 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -29,7 +29,6 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 90d777698..a693edb8e 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -72,7 +72,7 @@ public class GuiIronFurnace extends GuiBase { @Override protected void drawForeground(int mouseX, int mouseY) { - final String name = I18n.translate("blockEntity.techreborn.iron_furnace.name"); + final String name = I18n.translate("block.techreborn.iron_furnace"); font.draw(name, containerWidth / 2 - font.getStringWidth(name) / 2, 6, 4210752); font.draw(I18n.translate("container.inventory", new Object[0]), 8, containerHeight - 96 + 2, 4210752); diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index a7876afc1..da0d7bbb5 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -27,7 +27,6 @@ package techreborn.client.gui; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.ClientProxy; import reborncore.RebornCoreClient; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 92c29e905..cfd80403e 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -24,15 +24,11 @@ package techreborn.init; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RecipeManager; import reborncore.common.registration.RebornRegister; -import net.minecraft.fluid.Fluid; -import io.github.prospector.silk.fluid.FluidInstance; -import reborncore.common.fluid.FluidUtil; import techreborn.TechReborn; import techreborn.api.recipe.recipes.BlastFurnaceRecipe; import techreborn.api.recipe.recipes.IndustrialGrinderRecipe; @@ -66,30 +62,22 @@ public class ModRecipes { /* - ExtractorRecipes.init(); RollingMachineRecipes.init(); FluidGeneratorRecipes.init(); IndustrialGrinderRecipes.init(); - IndustrialCentrifugeRecipes.init(); + IndustrialElectrolyzerRecipes.init(); ImplosionCompressorRecipes.init(); ScrapboxRecipes.init(); - ChemicalReactorRecipes.init(); + FusionReactorRecipes.init(); - DistillationTowerRecipes.init(); FluidReplicatorRecipes.init(); - addVacuumFreezerRecipes(); - addGrinderRecipes(); - addCompressorRecipes(); */ } - public static void postInit() { - //IndustrialSawmillRecipes.init(); - } } diff --git a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java index 73fd3f835..57681a841 100644 --- a/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/techreborn/init/recipes/ImplosionCompressorRecipes.java @@ -42,28 +42,28 @@ public class ImplosionCompressorRecipes extends RecipeMethods { // register(getOre("dustPeridot", 4), getMaterial("peridot", 3, Type.GEM), 12); // register(getOre("dustRedGarnet", 4), getMaterial("red_garnet", 3, Type.GEM), 8); // register(getOre("dustYellowGarnet", 4), getMaterial("yellow_garnet", 3, Type.GEM), 8); - if (oresExist("dustApatite", "gemApatite")) { - register(getOre("dustApatite", 4), getOre("gemApatite", 3), 12); - } - - if (oresExist("dustCertusQuartz", "crystalCertusQuartz")) { - register(getOre("dustCertusQuartz", 4), getOre("crystalCertusQuartz", 3), 12); - } - if (oresExist("dustAmethyst", "gemAmethyst")) { - register(getOre("dustAmethyst", 4), getOre("gemAmethyst", 3), 12); - } - - if (oresExist("dustTopaz", "gemTopaz")) { - register(getOre("dustTopaz", 4), getOre("gemTopaz", 3), 12); - } - - if (oresExist("dustTanzanite", "gemTanzanite")) { - register(getOre("dustTanzanite", 4), getOre("gemTanzanite", 3), 12); - } - - if (oresExist("dustMalachite", "gemMalachite")) { - register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12); - } +// if (oresExist("dustApatite", "gemApatite")) { +// register(getOre("dustApatite", 4), getOre("gemApatite", 3), 12); +// } +// +// if (oresExist("dustCertusQuartz", "crystalCertusQuartz")) { +// register(getOre("dustCertusQuartz", 4), getOre("crystalCertusQuartz", 3), 12); +// } +// if (oresExist("dustAmethyst", "gemAmethyst")) { +// register(getOre("dustAmethyst", 4), getOre("gemAmethyst", 3), 12); +// } +// +// if (oresExist("dustTopaz", "gemTopaz")) { +// register(getOre("dustTopaz", 4), getOre("gemTopaz", 3), 12); +// } +// +// if (oresExist("dustTanzanite", "gemTanzanite")) { +// register(getOre("dustTanzanite", 4), getOre("gemTanzanite", 3), 12); +// } +// +// if (oresExist("dustMalachite", "gemMalachite")) { +// register(getOre("dustMalachite", 4), getOre("gemMalachite", 3), 12); +// } // register(getOre("blockRedstone", 9), getOre("dustRedGarnet", 4), 4); } diff --git a/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java b/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java deleted file mode 100644 index 7cc283f49..000000000 --- a/src/main/java/techreborn/itemblocks/ItemBlockRubberSapling.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.itemblocks; - -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import techreborn.TechReborn; - -/** - * Created by modmuss50 on 20/02/2016. - */ -public class ItemBlockRubberSapling extends BlockItem { - - public ItemBlockRubberSapling(Block block) { - super(block, new Item.Settings().group(TechReborn.ITEMGROUP)); - } -} diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/sphalerite_ore.json b/src/main/resources/data/techreborn/loot_tables/blocks/sphalerite_ore.json index 96b388dbe..d93f0d1a1 100644 --- a/src/main/resources/data/techreborn/loot_tables/blocks/sphalerite_ore.json +++ b/src/main/resources/data/techreborn/loot_tables/blocks/sphalerite_ore.json @@ -27,7 +27,7 @@ "name": "techreborn:sphalerite_ore" }, { - "type": "minecraft:group", + "type": "minecraft:sequence", "children": [ { "type": "minecraft:item",