Update to support RC 2.8

This commit is contained in:
modmuss50 2016-11-04 20:03:05 +00:00
parent e19f1c6ca9
commit 603c12590d
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
11 changed files with 77 additions and 50 deletions

View file

@ -62,7 +62,7 @@ configurations {
} }
version = "1.4.7" version = "1.4.8"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
@ -264,3 +264,10 @@ task updateMappings(dependsOn: sourceJar) {
} }
} }
} }
configurations.all {
resolutionStrategy {
cacheDynamicVersionsFor 0, "seconds"
cacheChangingModulesFor 0, "seconds"
}
}

View file

@ -1,6 +1,7 @@
package techreborn.client; package techreborn.client;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
@ -28,7 +29,7 @@ public class ClientMultiBlocks {
} }
private static boolean isCoil(int x, int y, int z) { 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; return true;
} }
@ -40,9 +41,10 @@ public class ClientMultiBlocks {
for (int j = -1; j < 2; j++) { for (int j = -1; j < 2; j++) {
for (int k = -1; k < 2; k++) { for (int k = -1; k < 2; k++) {
if ((i != 0) || (j != 0) || (k != 0)) { if ((i != 0) || (j != 0) || (k != 0)) {
frezzer.addComponent(xDir + i, yDir + j, zDir + k, ModBlocks.MachineCasing, BlockPos pos = new BlockPos(xDir + i, yDir + j, zDir + k);
(((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0)) int meta = (((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0))
|| ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1)); || ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1);
frezzer.addComponent(pos, ModBlocks.MachineCasing.getStateFromMeta(meta));
} }
} }
} }

View file

@ -1,14 +1,17 @@
package techreborn.client.gui; package techreborn.client.gui;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n; import net.minecraft.util.text.translation.I18n;
import reborncore.client.gui.GuiUtil; import reborncore.client.gui.GuiUtil;
import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.Multiblock;
import reborncore.client.multiblock.MultiblockRenderEvent;
import reborncore.client.multiblock.MultiblockSet; import reborncore.client.multiblock.MultiblockSet;
import reborncore.common.misc.Location; import reborncore.common.misc.Location;
import reborncore.common.multiblock.CoordTriplet; 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 {// This code here makes a basic multiblock and then sets to the
// selected one. // selected one.
Multiblock multiblock = new Multiblock(); Multiblock multiblock = new Multiblock();
multiblock.addComponent(0, 0, 0, ModBlocks.MachineCasing, 0); addComponent(0, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 0, 0, ModBlocks.MachineCasing, 0); addComponent(1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 0, 1, ModBlocks.MachineCasing, 0); addComponent(0, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 0, 0, ModBlocks.MachineCasing, 0); addComponent(-1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 0, -1, ModBlocks.MachineCasing, 0); addComponent(0, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 0, -1, ModBlocks.MachineCasing, 0); addComponent(-1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 0, 1, ModBlocks.MachineCasing, 0); addComponent(-1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 0, -1, ModBlocks.MachineCasing, 0); addComponent(1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 0, 1, ModBlocks.MachineCasing, 0); addComponent(1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 1, 0, ModBlocks.MachineCasing, 0); addComponent(1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 1, 1, ModBlocks.MachineCasing, 0); addComponent(0, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 1, 0, ModBlocks.MachineCasing, 0); addComponent(-1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 1, -1, ModBlocks.MachineCasing, 0); addComponent(0, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 1, -1, ModBlocks.MachineCasing, 0); addComponent(-1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 1, 1, ModBlocks.MachineCasing, 0); addComponent(-1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 1, -1, ModBlocks.MachineCasing, 0); addComponent(1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 1, 1, ModBlocks.MachineCasing, 0); addComponent(1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 2, 0, ModBlocks.MachineCasing, 0); addComponent(1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 2, 1, ModBlocks.MachineCasing, 0); addComponent(0, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 2, 0, ModBlocks.MachineCasing, 0); addComponent(-1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 2, -1, ModBlocks.MachineCasing, 0); addComponent(0, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 2, -1, ModBlocks.MachineCasing, 0); addComponent(-1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 2, 1, ModBlocks.MachineCasing, 0); addComponent(-1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 2, -1, ModBlocks.MachineCasing, 0); addComponent(1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 2, 1, ModBlocks.MachineCasing, 0); addComponent(1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 3, 0, ModBlocks.MachineCasing, 0); addComponent(0, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 3, 0, ModBlocks.MachineCasing, 0); addComponent(1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 3, 1, ModBlocks.MachineCasing, 0); addComponent(0, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 3, 0, ModBlocks.MachineCasing, 0); addComponent(-1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(0, 3, -1, ModBlocks.MachineCasing, 0); addComponent(0, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 3, -1, ModBlocks.MachineCasing, 0); addComponent(-1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(-1, 3, 1, ModBlocks.MachineCasing, 0); addComponent(-1, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 3, -1, ModBlocks.MachineCasing, 0); addComponent(1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
multiblock.addComponent(1, 3, 1, ModBlocks.MachineCasing, 0); 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); MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set); 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()); blastfurnace.getPos().getY(), blastfurnace.getPos().getZ(), blastfurnace.getWorld());
ClientProxy.multiblockRenderEvent.anchor = new CoordTriplet( MultiblockRenderEvent.anchor = new BlockPos(
blastfurnace.getPos().getX() blastfurnace.getPos().getX()
- (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetX() * 2), - (EnumFacing.getFront(blastfurnace.getFacingInt()).getFrontOffsetX() * 2),
blastfurnace.getPos().getY() - 1, blastfurnace.getPos().getZ() 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);
}
} }

View file

@ -38,9 +38,9 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I
} else if (baseRecipe instanceof ShapedRecipes) { } else if (baseRecipe instanceof ShapedRecipes) {
recipeWrapper = new ShapedRecipesWrapper((ShapedRecipes) baseRecipe); recipeWrapper = new ShapedRecipesWrapper((ShapedRecipes) baseRecipe);
} else if (baseRecipe instanceof ShapedOreRecipe) { } else if (baseRecipe instanceof ShapedOreRecipe) {
recipeWrapper = new ShapedOreRecipeWrapper((ShapedOreRecipe) baseRecipe); recipeWrapper = new ShapedOreRecipeWrapper(jeiHelpers, (ShapedOreRecipe) baseRecipe);
} else if (baseRecipe instanceof ShapelessOreRecipe) { } else if (baseRecipe instanceof ShapelessOreRecipe) {
recipeWrapper = new ShapelessOreRecipeWrapper(guiHelper, (ShapelessOreRecipe) baseRecipe); recipeWrapper = new ShapelessOreRecipeWrapper(jeiHelpers, (ShapelessOreRecipe) baseRecipe);
} else { } else {
return null; return null;
} }

View file

@ -6,7 +6,7 @@ public class ModInfo implements IModInfo {
public static final String MOD_NAME = "TechReborn"; public static final String MOD_NAME = "TechReborn";
public static final String MOD_ID = "techreborn"; public static final String MOD_ID = "techreborn";
public static final String MOD_VERSION = "@MODVERSION@"; 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 SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy"; public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy";
public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory"; public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory";

View file

@ -12,13 +12,14 @@ import reborncore.api.recipe.IBaseRecipeType;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
import techreborn.api.Reference; import techreborn.api.Reference;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, IInventoryProvider { public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchable, IInventoryProvider {
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(4, "TileAlloyFurnace", 64, this); public Inventory inventory = new Inventory(4, "TileAlloyFurnace", 64, this);

View file

@ -9,6 +9,7 @@ import net.minecraft.util.EnumFacing;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
@ -16,7 +17,7 @@ import techreborn.init.ModBlocks;
import java.util.List; 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 0 = Input
// Slot 1 = Output // Slot 1 = Output

View file

@ -6,10 +6,11 @@ import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.tileentity.TileEntityFurnace;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
public class TileIronFurnace extends TileMachineBase implements IInventoryProvider { public class TileIronFurnace extends TileLegacyMachineBase implements IInventoryProvider {
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(3, "TileIronFurnace", 64, this); public Inventory inventory = new Inventory(3, "TileIronFurnace", 64, this);

View file

@ -10,6 +10,7 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
import reborncore.common.util.ItemUtils; import reborncore.common.util.ItemUtils;
@ -17,7 +18,7 @@ import techreborn.init.ModBlocks;
import java.util.List; import java.util.List;
public class TileQuantumChest extends TileMachineBase public class TileQuantumChest extends TileLegacyMachineBase
implements IInventoryProvider, IWrenchable, IDeepStorageUnit, IListInfoProvider { implements IInventoryProvider, IWrenchable, IDeepStorageUnit, IListInfoProvider {
// Slot 0 = Input // Slot 0 = Input

View file

@ -13,6 +13,7 @@ import net.minecraftforge.fluids.IFluidHandler;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable; import reborncore.common.IWrenchable;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import reborncore.common.util.FluidUtils; import reborncore.common.util.FluidUtils;
import reborncore.common.util.Inventory; import reborncore.common.util.Inventory;
@ -21,7 +22,7 @@ import techreborn.init.ModBlocks;
import java.util.List; import java.util.List;
public class TileQuantumTank extends TileMachineBase public class TileQuantumTank extends TileLegacyMachineBase
implements IFluidHandler, IInventoryProvider, IWrenchable, IListInfoProvider { implements IFluidHandler, IInventoryProvider, IWrenchable, IListInfoProvider {
public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this); public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this);

View file

@ -3,9 +3,10 @@ package techreborn.tiles.lesu;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
public class TileLesuStorage extends TileMachineBase { public class TileLesuStorage extends TileLegacyMachineBase {
public LesuNetwork network; public LesuNetwork network;