Added some recipes, fixed the Dictionary sync issue
This commit is contained in:
parent
d4e3b5f134
commit
3e6e31ad3a
4 changed files with 20 additions and 8 deletions
|
@ -302,11 +302,6 @@ public class CommonProxy
|
||||||
{
|
{
|
||||||
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
|
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
|
||||||
|
|
||||||
if(tileEntity == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch(ID)
|
switch(ID)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
|
|
|
@ -547,6 +547,15 @@ public class Mekanism
|
||||||
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock2, 1, 0), new Object[] {
|
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock2, 1, 0), new Object[] {
|
||||||
"CCC", "CTC", "CCC", Character.valueOf('C'), "ingotCopper", Character.valueOf('T'), new ItemStack(BasicBlock, 1, 9)
|
"CCC", "CTC", "CCC", Character.valueOf('C'), "ingotCopper", Character.valueOf('T'), new ItemStack(BasicBlock, 1, 9)
|
||||||
}));
|
}));
|
||||||
|
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 6), new Object[] {
|
||||||
|
"CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('E'), EnrichedAlloy
|
||||||
|
}));
|
||||||
|
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 7), new Object[] {
|
||||||
|
"CWC", "EIE", "CGC", Character.valueOf('W'), Item.bucketWater, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8)
|
||||||
|
}));
|
||||||
|
CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 8), new Object[] {
|
||||||
|
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicCore, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8)
|
||||||
|
}));
|
||||||
|
|
||||||
for(RecipeType type : RecipeType.values())
|
for(RecipeType type : RecipeType.values())
|
||||||
{
|
{
|
||||||
|
|
|
@ -49,6 +49,14 @@ public final class OreDictManager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(OreDictionary.getOres("itemRubber").size() > 0)
|
||||||
|
{
|
||||||
|
for(ItemStack ore : OreDictionary.getOres("woodRubber"))
|
||||||
|
{
|
||||||
|
RecipeHandler.addPrecisionSawmillRecipe(MekanismUtils.size(ore, 1), new ChanceOutput(new ItemStack(Block.planks, 4), MekanismUtils.size(OreDictionary.getOres("itemRubber").get(0), 1), 1F));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for(ItemStack ore : OreDictionary.getOres("dustSulfur"))
|
for(ItemStack ore : OreDictionary.getOres("dustSulfur"))
|
||||||
{
|
{
|
||||||
RecipeHandler.addChemicalOxidizerRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 100));
|
RecipeHandler.addChemicalOxidizerRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 100));
|
||||||
|
|
|
@ -12,15 +12,15 @@ public class ContainerDictionary extends Container
|
||||||
{
|
{
|
||||||
int slotX;
|
int slotX;
|
||||||
|
|
||||||
for(slotX = 0; slotX < 3; ++slotX)
|
for(slotX = 0; slotX < 3; slotX++)
|
||||||
{
|
{
|
||||||
for(int slotY = 0; slotY < 9; ++slotY)
|
for(int slotY = 0; slotY < 9; slotY++)
|
||||||
{
|
{
|
||||||
addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18));
|
addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 84 + slotX * 18));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(slotX = 0; slotX < 9; ++slotX)
|
for(slotX = 0; slotX < 9; slotX++)
|
||||||
{
|
{
|
||||||
addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142));
|
addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 142));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue