diff --git a/build.conf b/build.conf new file mode 100644 index 000000000..adce120e9 --- /dev/null +++ b/build.conf @@ -0,0 +1,5 @@ +minecraftVersion="1.10.2" +name="TechReborn" +curseID="233564" +child-project="reborncore" +child-type="requiredLibrary" \ No newline at end of file diff --git a/build.gradle b/build.gradle index 90951b348..d8cb98714 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ configurations { } -version = "1.4.11" +version = "1.4.13" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { @@ -282,4 +282,33 @@ configurations.all { } } -apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' \ No newline at end of file +apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' + +import org.apache.commons.io.FileUtils; +import groovy.util.XmlSlurper; +import java.io.File; + +task curseTools << { + def cacheFiles = new File(".gradle/curseTools") + if (!cacheFiles.exists()) cacheFiles.mkdirs() + + def mavenMetadata = new File(cacheFiles, "maven-metadata.xml") + + logger.lifecycle(":downloading curseTools metadata") + FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata) + + def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata)) + def curseToolsVersion = metadata.versioning.release + + def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar") + + logger.lifecycle(":downloading CurseTools") + FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools) + + logger.lifecycle(":launching CurseTools") + ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) { + arg(value: jar.archivePath.getAbsolutePath()) + arg(value: deobfJar.archivePath.getAbsolutePath()) + arg(value: apiJar.archivePath.getAbsolutePath()) + } +} \ No newline at end of file diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 7f3425154..8e54a659a 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -80,13 +80,13 @@ public class GuiHandler implements IGuiHandler { } else if (ID == quantumChestID) { return new ContainerQuantumChest((TileQuantumChest) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == centrifugeID) { - container = new ContainerCentrifuge(); + container = new ContainerCentrifuge(player, (TileCentrifuge) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == rollingMachineID) { return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == blastFurnaceID) { return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == alloySmelterID) { - container = new ContainerAlloySmelter(); + container = new ContainerAlloySmelter(player, (TileAlloySmelter) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == industrialGrinderID) { return new ContainerIndustrialGrinder((TileIndustrialGrinder) world.getTileEntity(new BlockPos(x, y, z)), player); @@ -99,7 +99,7 @@ public class GuiHandler implements IGuiHandler { } else if (ID == chunkloaderID) { return new ContainerChunkloader((TileChunkLoader) world.getTileEntity(new BlockPos(x, y, z)), player); } else if (ID == assemblingmachineID) { - container = new ContainerAssemblingMachine(); + container = new ContainerAssemblingMachine(player, (TileAssemblingMachine) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == dieselGeneratorID) { return new ContainerDieselGenerator((TileDieselGenerator) world.getTileEntity(new BlockPos(x, y, z)), player); diff --git a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java index 05142cf63..9e932c926 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java +++ b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java @@ -13,18 +13,26 @@ import techreborn.tiles.TileAlloySmelter; import javax.annotation.Nullable; import java.util.List; -public class ContainerAlloySmelter extends ContainerCrafting implements IContainerLayout { +public class ContainerAlloySmelter extends ContainerCrafting { public int tickTime; EntityPlayer player; TileAlloySmelter tile; + public ContainerAlloySmelter(EntityPlayer player, TileAlloySmelter tile) { + super(tile.crafter); + this.player = player; + this.tile = tile; + addPlayerSlots(); + addInventorySlots(); + } + @Override public boolean canInteractWith(EntityPlayer player) { return true; } - @Override + public void addInventorySlots() { // input @@ -41,7 +49,7 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62)); } - @Override + public void addPlayerSlots() { int i; @@ -56,32 +64,4 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain } } - @Override - public void setTile(TileAlloySmelter tile) { - this.tile = tile; - setCrafter(tile.crafter); - } - - @Nullable - @Override - public TileAlloySmelter getTile() { - return tile; - } - - @Override - public void setPlayer(EntityPlayer player) { - this.player = player; - } - - @Nullable - @Override - public EntityPlayer getPlayer() { - return player; - } - - @Nullable - @Override - public List getSlotsForSide(EnumFacing facing) { - return null; - } } diff --git a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java index 8cf68d4df..562d8cbf4 100644 --- a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java @@ -11,7 +11,7 @@ import techreborn.tiles.TileAssemblingMachine; import javax.annotation.Nullable; import java.util.List; -public class ContainerAssemblingMachine extends ContainerCrafting implements IContainerLayout { +public class ContainerAssemblingMachine extends ContainerCrafting{ public int tickTime; EntityPlayer player; @@ -22,7 +22,15 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo return true; } - @Override + public ContainerAssemblingMachine(EntityPlayer player, TileAssemblingMachine tile) { + super(tile.crafter); + this.player = player; + this.tile = tile; + addPlayerSlots(); + addInventorySlots(); + } + + public void addInventorySlots() { // input this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 47, 17)); @@ -38,7 +46,7 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62)); } - @Override + public void addPlayerSlots() { int i; @@ -53,32 +61,4 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo } } - @Override - public void setTile(TileAssemblingMachine tile) { - this.tile = tile; - this.crafter = tile.crafter; - } - - @Nullable - @Override - public TileAssemblingMachine getTile() { - return tile; - } - - @Override - public void setPlayer(EntityPlayer player) { - this.player = player; - } - - @Nullable - @Override - public EntityPlayer getPlayer() { - return player; - } - - @Nullable - @Override - public List getSlotsForSide(EnumFacing facing) { - return null; - } } diff --git a/src/main/java/techreborn/client/container/ContainerCentrifuge.java b/src/main/java/techreborn/client/container/ContainerCentrifuge.java index 910837450..b8ee7e0ef 100644 --- a/src/main/java/techreborn/client/container/ContainerCentrifuge.java +++ b/src/main/java/techreborn/client/container/ContainerCentrifuge.java @@ -11,18 +11,26 @@ import techreborn.tiles.TileCentrifuge; import javax.annotation.Nullable; import java.util.List; -public class ContainerCentrifuge extends ContainerCrafting implements IContainerLayout { +public class ContainerCentrifuge extends ContainerCrafting { public int tickTime; EntityPlayer player; TileCentrifuge tile; + public ContainerCentrifuge(EntityPlayer player, TileCentrifuge tile) { + super(tile.crafter); + this.player = player; + this.tile = tile; + addInventorySlots(); + addPlayerSlots(); + } + @Override public boolean canInteractWith(EntityPlayer player) { return true; } - @Override + public void addInventorySlots() { // input this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 80, 35)); @@ -41,7 +49,7 @@ public class ContainerCentrifuge extends ContainerCrafting implements IContainer this.addSlotToContainer(new SlotUpgrade(tile.inventory, 10, 152, 62)); } - @Override + public void addPlayerSlots() { int i; @@ -56,32 +64,4 @@ public class ContainerCentrifuge extends ContainerCrafting implements IContainer } } - @Override - public void setTile(TileCentrifuge tile) { - this.tile = tile; - this.crafter = tile.crafter; - } - - @Nullable - @Override - public TileCentrifuge getTile() { - return tile; - } - - @Override - public void setPlayer(EntityPlayer player) { - this.player = player; - } - - @Nullable - @Override - public EntityPlayer getPlayer() { - return player; - } - - @Nullable - @Override - public List getSlotsForSide(EnumFacing facing) { - return null; - } } diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 5b394dc64..ecafe2b57 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -17,7 +17,7 @@ import techreborn.api.Reference; import techreborn.client.container.ContainerAssemblingMachine; import techreborn.init.ModBlocks; -public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider { +public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider { public int tickTime; public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64, this); @@ -126,11 +126,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha return crafter; } - @Override - public RebornContainer getContainer() { - return RebornContainer.getContainerFromClass(ContainerAssemblingMachine.class, this); - } - @Override public int[] getSlotsForFace(EnumFacing side) { return new int[] { 0, 1, 2 }; diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 72c35fb78..455f4a19d 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -24,7 +24,7 @@ import techreborn.init.ModBlocks; import java.util.List; public class TileCentrifuge extends TilePowerAcceptor - implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider { + implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider { public int tickTime; public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this); @@ -161,8 +161,4 @@ public class TileCentrifuge extends TilePowerAcceptor return crafter; } - @Override - public RebornContainer getContainer() { - return RebornContainer.getContainerFromClass(ContainerCentrifuge.class, this); - } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index 17d2eb191..af246a7b4 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -26,10 +26,8 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II public TileCompressor() { super(1); - int[] inputs = new int[1]; - inputs[0] = 0; - int[] outputs = new int[1]; - outputs[0] = 1; + int[] inputs = new int[] { 0 }; + int[] outputs = new int[] { 1 }; crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, inventory, inputs, outputs); upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5); } @@ -78,15 +76,13 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II } @Override - public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { - if (slotIndex == 2) - return false; - return isItemValidForSlot(slotIndex, itemStack); + public boolean canInsertItem(int Index, ItemStack itemStack, EnumFacing side) { + return Index == 0; } @Override - public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { - return slotIndex == 1; + public boolean canExtractItem(int Index, ItemStack itemStack, EnumFacing side) { + return Index == 1; } public int getProgressScaled(int scale) { diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index 2eed14392..b4d4859e8 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -202,7 +202,7 @@ public class TechRebornWorldGen implements IWorldGenerator { boolean genTree = false; List list = new ArrayList<>(); Predicate predicate = BlockMatcher.forBlock(Blocks.STONE); - if (world.provider.getDimension() == 0) { + if (world.provider.isSurfaceWorld()) { list.addAll(getAllGenOresFromList(config.overworldOres)); genTree = true; } else if (world.provider.getDimension() == -1) {