Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11

# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
This commit is contained in:
modmuss50 2016-12-05 10:57:55 +00:00
commit 5782d2d032
10 changed files with 81 additions and 120 deletions

5
build.conf Normal file
View file

@ -0,0 +1,5 @@
minecraftVersion="1.10.2"
name="TechReborn"
curseID="233564"
child-project="reborncore"
child-type="requiredLibrary"

View file

@ -67,7 +67,7 @@ configurations {
} }
version = "1.4.11" version = "1.4.13"
def ENV = System.getenv() def ENV = System.getenv()
if (ENV.BUILD_NUMBER) { if (ENV.BUILD_NUMBER) {
@ -282,4 +282,33 @@ configurations.all {
} }
} }
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' 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())
}
}

View file

@ -80,13 +80,13 @@ public class GuiHandler implements IGuiHandler {
} else if (ID == quantumChestID) { } else if (ID == quantumChestID) {
return new ContainerQuantumChest((TileQuantumChest) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerQuantumChest((TileQuantumChest) world.getTileEntity(new BlockPos(x, y, z)), player);
} else if (ID == centrifugeID) { } else if (ID == centrifugeID) {
container = new ContainerCentrifuge(); container = new ContainerCentrifuge(player, (TileCentrifuge) world.getTileEntity(new BlockPos(x, y, z)));
} else if (ID == rollingMachineID) { } else if (ID == rollingMachineID) {
return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(new BlockPos(x, y, z)), player);
} else if (ID == blastFurnaceID) { } else if (ID == blastFurnaceID) {
return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(new BlockPos(x, y, z)), player);
} else if (ID == alloySmelterID) { } else if (ID == alloySmelterID) {
container = new ContainerAlloySmelter(); container = new ContainerAlloySmelter(player, (TileAlloySmelter) world.getTileEntity(new BlockPos(x, y, z)));
} else if (ID == industrialGrinderID) { } else if (ID == industrialGrinderID) {
return new ContainerIndustrialGrinder((TileIndustrialGrinder) world.getTileEntity(new BlockPos(x, y, z)), return new ContainerIndustrialGrinder((TileIndustrialGrinder) world.getTileEntity(new BlockPos(x, y, z)),
player); player);
@ -99,7 +99,7 @@ public class GuiHandler implements IGuiHandler {
} else if (ID == chunkloaderID) { } else if (ID == chunkloaderID) {
return new ContainerChunkloader((TileChunkLoader) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerChunkloader((TileChunkLoader) world.getTileEntity(new BlockPos(x, y, z)), player);
} else if (ID == assemblingmachineID) { } else if (ID == assemblingmachineID) {
container = new ContainerAssemblingMachine(); container = new ContainerAssemblingMachine(player, (TileAssemblingMachine) world.getTileEntity(new BlockPos(x, y, z)));
} else if (ID == dieselGeneratorID) { } else if (ID == dieselGeneratorID) {
return new ContainerDieselGenerator((TileDieselGenerator) world.getTileEntity(new BlockPos(x, y, z)), return new ContainerDieselGenerator((TileDieselGenerator) world.getTileEntity(new BlockPos(x, y, z)),
player); player);

View file

@ -13,18 +13,26 @@ import techreborn.tiles.TileAlloySmelter;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
public class ContainerAlloySmelter extends ContainerCrafting implements IContainerLayout<TileAlloySmelter> { public class ContainerAlloySmelter extends ContainerCrafting {
public int tickTime; public int tickTime;
EntityPlayer player; EntityPlayer player;
TileAlloySmelter tile; TileAlloySmelter tile;
public ContainerAlloySmelter(EntityPlayer player, TileAlloySmelter tile) {
super(tile.crafter);
this.player = player;
this.tile = tile;
addPlayerSlots();
addInventorySlots();
}
@Override @Override
public boolean canInteractWith(EntityPlayer player) { public boolean canInteractWith(EntityPlayer player) {
return true; return true;
} }
@Override
public void addInventorySlots() { public void addInventorySlots() {
// input // input
@ -41,7 +49,7 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain
this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62)); this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62));
} }
@Override
public void addPlayerSlots() { public void addPlayerSlots() {
int i; 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<Integer> getSlotsForSide(EnumFacing facing) {
return null;
}
} }

View file

@ -11,7 +11,7 @@ import techreborn.tiles.TileAssemblingMachine;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
public class ContainerAssemblingMachine extends ContainerCrafting implements IContainerLayout<TileAssemblingMachine> { public class ContainerAssemblingMachine extends ContainerCrafting{
public int tickTime; public int tickTime;
EntityPlayer player; EntityPlayer player;
@ -22,7 +22,15 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo
return true; return true;
} }
@Override public ContainerAssemblingMachine(EntityPlayer player, TileAssemblingMachine tile) {
super(tile.crafter);
this.player = player;
this.tile = tile;
addPlayerSlots();
addInventorySlots();
}
public void addInventorySlots() { public void addInventorySlots() {
// input // input
this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 47, 17)); 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)); this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62));
} }
@Override
public void addPlayerSlots() { public void addPlayerSlots() {
int i; 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<Integer> getSlotsForSide(EnumFacing facing) {
return null;
}
} }

View file

@ -11,18 +11,26 @@ import techreborn.tiles.TileCentrifuge;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
public class ContainerCentrifuge extends ContainerCrafting implements IContainerLayout<TileCentrifuge> { public class ContainerCentrifuge extends ContainerCrafting {
public int tickTime; public int tickTime;
EntityPlayer player; EntityPlayer player;
TileCentrifuge tile; TileCentrifuge tile;
public ContainerCentrifuge(EntityPlayer player, TileCentrifuge tile) {
super(tile.crafter);
this.player = player;
this.tile = tile;
addInventorySlots();
addPlayerSlots();
}
@Override @Override
public boolean canInteractWith(EntityPlayer player) { public boolean canInteractWith(EntityPlayer player) {
return true; return true;
} }
@Override
public void addInventorySlots() { public void addInventorySlots() {
// input // input
this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 80, 35)); 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)); this.addSlotToContainer(new SlotUpgrade(tile.inventory, 10, 152, 62));
} }
@Override
public void addPlayerSlots() { public void addPlayerSlots() {
int i; 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<Integer> getSlotsForSide(EnumFacing facing) {
return null;
}
} }

View file

@ -17,7 +17,7 @@ import techreborn.api.Reference;
import techreborn.client.container.ContainerAssemblingMachine; import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.init.ModBlocks; 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 int tickTime;
public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64, this); public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64, this);
@ -126,11 +126,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
return crafter; return crafter;
} }
@Override
public RebornContainer getContainer() {
return RebornContainer.getContainerFromClass(ContainerAssemblingMachine.class, this);
}
@Override @Override
public int[] getSlotsForFace(EnumFacing side) { public int[] getSlotsForFace(EnumFacing side) {
return new int[] { 0, 1, 2 }; return new int[] { 0, 1, 2 };

View file

@ -24,7 +24,7 @@ import techreborn.init.ModBlocks;
import java.util.List; import java.util.List;
public class TileCentrifuge extends TilePowerAcceptor public class TileCentrifuge extends TilePowerAcceptor
implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider { implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider {
public int tickTime; public int tickTime;
public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this); public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this);
@ -161,8 +161,4 @@ public class TileCentrifuge extends TilePowerAcceptor
return crafter; return crafter;
} }
@Override
public RebornContainer getContainer() {
return RebornContainer.getContainerFromClass(ContainerCentrifuge.class, this);
}
} }

View file

@ -26,10 +26,8 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
public TileCompressor() { public TileCompressor() {
super(1); super(1);
int[] inputs = new int[1]; int[] inputs = new int[] { 0 };
inputs[0] = 0; int[] outputs = new int[] { 1 };
int[] outputs = new int[1];
outputs[0] = 1;
crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, inventory, inputs, outputs); crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, inventory, inputs, outputs);
upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5); upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5);
} }
@ -78,15 +76,13 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
} }
@Override @Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { public boolean canInsertItem(int Index, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2) return Index == 0;
return false;
return isItemValidForSlot(slotIndex, itemStack);
} }
@Override @Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { public boolean canExtractItem(int Index, ItemStack itemStack, EnumFacing side) {
return slotIndex == 1; return Index == 1;
} }
public int getProgressScaled(int scale) { public int getProgressScaled(int scale) {

View file

@ -202,7 +202,7 @@ public class TechRebornWorldGen implements IWorldGenerator {
boolean genTree = false; boolean genTree = false;
List<OreConfig> list = new ArrayList<>(); List<OreConfig> list = new ArrayList<>();
Predicate<IBlockState> predicate = BlockMatcher.forBlock(Blocks.STONE); Predicate<IBlockState> predicate = BlockMatcher.forBlock(Blocks.STONE);
if (world.provider.getDimension() == 0) { if (world.provider.isSurfaceWorld()) {
list.addAll(getAllGenOresFromList(config.overworldOres)); list.addAll(getAllGenOresFromList(config.overworldOres));
genTree = true; genTree = true;
} else if (world.provider.getDimension() == -1) { } else if (world.provider.getDimension() == -1) {