Merge branch 'master' of https://github.com/TechReborn/TechReborn
This commit is contained in:
commit
fcc09445a9
2 changed files with 7 additions and 3 deletions
|
@ -170,10 +170,13 @@ public class BlockMachineBase extends BlockContainer {
|
||||||
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
|
public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
|
||||||
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
|
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
|
||||||
if(Loader.isModLoaded("IC2")){
|
if(Loader.isModLoaded("IC2")){
|
||||||
items.add(IC2Items.getItem(isAdvanced() ? "advancedMachine" : "machine"));
|
ItemStack stack = IC2Items.getItem(isAdvanced() ? "advancedMachine" : "machine").copy();
|
||||||
|
stack.stackSize = 1;
|
||||||
|
items.add(stack);
|
||||||
} else {
|
} else {
|
||||||
items.add(isAdvanced()? new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0) : new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2));
|
items.add(isAdvanced()? new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2) : new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0));
|
||||||
}
|
}
|
||||||
|
System.out.println(items.toString());
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.ChunkCoordinates;
|
import net.minecraft.util.ChunkCoordinates;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
import techreborn.client.GuiUtil;
|
import techreborn.client.GuiUtil;
|
||||||
import techreborn.client.container.ContainerBlastFurnace;
|
import techreborn.client.container.ContainerBlastFurnace;
|
||||||
import techreborn.client.multiblock.Multiblock;
|
import techreborn.client.multiblock.Multiblock;
|
||||||
|
@ -124,7 +125,7 @@ public class GuiBlastFurnace extends GuiContainer {
|
||||||
|
|
||||||
MultiblockSet set = new MultiblockSet(multiblock);
|
MultiblockSet set = new MultiblockSet(multiblock);
|
||||||
ClientProxy.multiblockRenderEvent.setMultiblock(set);
|
ClientProxy.multiblockRenderEvent.setMultiblock(set);
|
||||||
ClientProxy.multiblockRenderEvent.anchor = new ChunkCoordinates(blastfurnace.xCoord + 2, blastfurnace.yCoord - 1, blastfurnace.zCoord);
|
ClientProxy.multiblockRenderEvent.anchor = new ChunkCoordinates(blastfurnace.xCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetX * 2), blastfurnace.yCoord - 1, blastfurnace.zCoord - (ForgeDirection.getOrientation(blastfurnace.getRotation()).offsetZ * 2));
|
||||||
}
|
}
|
||||||
button.displayString = "A";
|
button.displayString = "A";
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue