diff --git a/build.gradle b/build.gradle index 33760e97d..cf84e2c82 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ configurations { } -version = "1.4.7" +version = "1.4.8" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { @@ -264,3 +264,10 @@ task updateMappings(dependsOn: sourceJar) { } } } + +configurations.all { + resolutionStrategy { + cacheDynamicVersionsFor 0, "seconds" + cacheChangingModulesFor 0, "seconds" + } +} diff --git a/src/main/java/techreborn/client/ClientMultiBlocks.java b/src/main/java/techreborn/client/ClientMultiBlocks.java index 7aee36d1d..11b91feb2 100644 --- a/src/main/java/techreborn/client/ClientMultiBlocks.java +++ b/src/main/java/techreborn/client/ClientMultiBlocks.java @@ -1,6 +1,7 @@ package techreborn.client; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import reborncore.client.multiblock.Multiblock; import techreborn.init.ModBlocks; @@ -28,7 +29,7 @@ public class ClientMultiBlocks { } private static boolean isCoil(int x, int y, int z) { - reactor.addComponent(x, y, z, ModBlocks.FusionCoil, 0); + reactor.addComponent(new BlockPos(x, y, z), ModBlocks.FusionCoil.getDefaultState()); return true; } @@ -40,9 +41,10 @@ public class ClientMultiBlocks { for (int j = -1; j < 2; j++) { for (int k = -1; k < 2; k++) { if ((i != 0) || (j != 0) || (k != 0)) { - frezzer.addComponent(xDir + i, yDir + j, zDir + k, ModBlocks.MachineCasing, - (((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0)) - || ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1)); + BlockPos pos = new BlockPos(xDir + i, yDir + j, zDir + k); + int meta = (((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0)) + || ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1); + frezzer.addComponent(pos, ModBlocks.MachineCasing.getStateFromMeta(meta)); } } } diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index 5e27c96f1..39cc4d8be 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -1,14 +1,17 @@ package techreborn.client.gui; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; import reborncore.client.gui.GuiUtil; import reborncore.client.multiblock.Multiblock; +import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import reborncore.common.misc.Location; import reborncore.common.multiblock.CoordTriplet; @@ -106,49 +109,53 @@ public class GuiBlastFurnace extends GuiContainer { {// This code here makes a basic multiblock and then sets to the // selected one. Multiblock multiblock = new Multiblock(); - multiblock.addComponent(0, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 0, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 0, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 0, 1, ModBlocks.MachineCasing, 0); + addComponent(0, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); - multiblock.addComponent(1, 1, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 1, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 1, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 1, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 1, 1, ModBlocks.MachineCasing, 0); + addComponent(1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); - multiblock.addComponent(1, 2, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 2, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0); + addComponent(1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); - multiblock.addComponent(0, 3, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0); - multiblock.addComponent(0, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(-1, 3, 1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 3, -1, ModBlocks.MachineCasing, 0); - multiblock.addComponent(1, 3, 1, ModBlocks.MachineCasing, 0); + addComponent(0, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(0, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(-1, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + addComponent(1, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock); + + addComponent(1, 4, 0, ModBlocks.LesuStorage.getDefaultState(), multiblock); + addComponent(1, 4, 1, ModBlocks.Lesu.getDefaultState(), multiblock); + addComponent(1, 4, 2, ModBlocks.AlloyFurnace.getDefaultState(), multiblock); MultiblockSet set = new MultiblockSet(multiblock); ClientProxy.multiblockRenderEvent.setMultiblock(set); - ClientProxy.multiblockRenderEvent.partent = new Location(blastfurnace.getPos().getX(), + ClientProxy.multiblockRenderEvent.parent = new Location(blastfurnace.getPos().getX(), blastfurnace.getPos().getY(), blastfurnace.getPos().getZ(), blastfurnace.getWorld()); - ClientProxy.multiblockRenderEvent.anchor = new CoordTriplet( + MultiblockRenderEvent.anchor = new BlockPos( blastfurnace.getPos().getX() - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetX() * 2), blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() @@ -161,4 +168,9 @@ public class GuiBlastFurnace extends GuiContainer { } } } + + public void addComponent(int x, int y, int z, IBlockState blockState, Multiblock multiblock) { + multiblock.addComponent(new BlockPos(x, y, z), blockState); + } + } diff --git a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java index aa013132c..f85295e61 100644 --- a/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java +++ b/src/main/java/techreborn/compat/jei/rollingMachine/RollingMachineRecipeWrapper.java @@ -38,9 +38,9 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I } else if (baseRecipe instanceof ShapedRecipes) { recipeWrapper = new ShapedRecipesWrapper((ShapedRecipes) baseRecipe); } else if (baseRecipe instanceof ShapedOreRecipe) { - recipeWrapper = new ShapedOreRecipeWrapper((ShapedOreRecipe) baseRecipe); + recipeWrapper = new ShapedOreRecipeWrapper(jeiHelpers, (ShapedOreRecipe) baseRecipe); } else if (baseRecipe instanceof ShapelessOreRecipe) { - recipeWrapper = new ShapelessOreRecipeWrapper(guiHelper, (ShapelessOreRecipe) baseRecipe); + recipeWrapper = new ShapelessOreRecipeWrapper(jeiHelpers, (ShapelessOreRecipe) baseRecipe); } else { return null; } diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index 48d3b9d93..b26618042 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -6,7 +6,7 @@ public class ModInfo implements IModInfo { public static final String MOD_NAME = "TechReborn"; public static final String MOD_ID = "techreborn"; public static final String MOD_VERSION = "@MODVERSION@"; - public static final String MOD_DEPENDENCIES = "required-after:Forge@[11.15.0.1609,);required-after:reborncore;after:JEI@[3.11,);after:IC2"; + public static final String MOD_DEPENDENCIES = "required-after:Forge@[11.15.0.1609,);required-after:reborncore@[2.8,);after:JEI@[3.13,);after:IC2"; public static final String SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory"; diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 702ec43c0..6b6c5f2e9 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -12,13 +12,14 @@ import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.api.Reference; import techreborn.init.ModBlocks; -public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, IInventoryProvider { +public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchable, IInventoryProvider { public int tickTime; public Inventory inventory = new Inventory(4, "TileAlloyFurnace", 64, this); diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 15340291e..15fd99a48 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -9,6 +9,7 @@ import net.minecraft.util.EnumFacing; import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -16,7 +17,7 @@ import techreborn.init.ModBlocks; import java.util.List; -public class TileDigitalChest extends TileMachineBase implements IInventoryProvider, IWrenchable, IListInfoProvider { +public class TileDigitalChest extends TileLegacyMachineBase implements IInventoryProvider, IWrenchable, IListInfoProvider { // Slot 0 = Input // Slot 1 = Output diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 15cb765af..8a289b24b 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -6,10 +6,11 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; import reborncore.api.tile.IInventoryProvider; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; -public class TileIronFurnace extends TileMachineBase implements IInventoryProvider { +public class TileIronFurnace extends TileLegacyMachineBase implements IInventoryProvider { public int tickTime; public Inventory inventory = new Inventory(3, "TileIronFurnace", 64, this); diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index a7dbd38fb..9138d1894 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -10,6 +10,7 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -17,7 +18,7 @@ import techreborn.init.ModBlocks; import java.util.List; -public class TileQuantumChest extends TileMachineBase +public class TileQuantumChest extends TileLegacyMachineBase implements IInventoryProvider, IWrenchable, IDeepStorageUnit, IListInfoProvider { // Slot 0 = Input diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index bd2831db8..0ebd7486e 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -13,6 +13,7 @@ import net.minecraftforge.fluids.IFluidHandler; import reborncore.api.IListInfoProvider; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; @@ -21,7 +22,7 @@ import techreborn.init.ModBlocks; import java.util.List; -public class TileQuantumTank extends TileMachineBase +public class TileQuantumTank extends TileLegacyMachineBase implements IFluidHandler, IInventoryProvider, IWrenchable, IListInfoProvider { public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this); diff --git a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java index 52d66ff70..0ce9056c2 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java @@ -3,9 +3,10 @@ package techreborn.tiles.lesu; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileMachineBase; -public class TileLesuStorage extends TileMachineBase { +public class TileLesuStorage extends TileLegacyMachineBase { public LesuNetwork network;