Merge remote-tracking branch 'origin/1.12' into 1.12
This commit is contained in:
commit
0fbc9fe04b
4 changed files with 28 additions and 9 deletions
|
@ -111,6 +111,23 @@ public class ModRecipes {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
IndustrialSawmillRecipes.init();
|
IndustrialSawmillRecipes.init();
|
||||||
|
|
||||||
|
//Let it be in postInit to be sure that oredict already there
|
||||||
|
if (OreUtil.doesOreExistAndValid("stoneMarble")) {
|
||||||
|
ItemStack marbleStack = getOre("stoneMarble");
|
||||||
|
marbleStack.setCount(1);
|
||||||
|
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||||
|
marbleStack, ItemDusts.getDustByName("marble"),
|
||||||
|
120, 10));
|
||||||
|
}
|
||||||
|
if (OreUtil.doesOreExistAndValid("stoneBasalt")) {
|
||||||
|
ItemStack marbleStack = getOre("stoneBasalt");
|
||||||
|
marbleStack.setCount(1);
|
||||||
|
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||||
|
marbleStack, ItemDusts.getDustByName("basalt"),
|
||||||
|
120, 10));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void addCompressorRecipes() {
|
private static void addCompressorRecipes() {
|
||||||
|
@ -229,7 +246,7 @@ public class ModRecipes {
|
||||||
new ItemStack(Blocks.END_STONE),
|
new ItemStack(Blocks.END_STONE),
|
||||||
ItemDusts.getDustByName("endstone"),
|
ItemDusts.getDustByName("endstone"),
|
||||||
300, 16));
|
300, 16));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void addReactorRecipes() {
|
static void addReactorRecipes() {
|
||||||
|
|
|
@ -324,7 +324,6 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
|
||||||
protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException {
|
protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException {
|
||||||
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
|
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
|
||||||
|
|
||||||
System.out.println(block);
|
|
||||||
if (block.isAir(world.getBlockState(new BlockPos(x, y, z)), world, new BlockPos(x, y, z))) {
|
if (block.isAir(world.getBlockState(new BlockPos(x, y, z)), world, new BlockPos(x, y, z))) {
|
||||||
|
|
||||||
} else if (block.getUnlocalizedName().equals("tile.lava")) {
|
} else if (block.getUnlocalizedName().equals("tile.lava")) {
|
||||||
|
@ -344,4 +343,4 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,8 +51,10 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
||||||
public static int maxInput = 8192;
|
public static int maxInput = 8192;
|
||||||
@ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorMaxEnergy", comment = "Matter Fabricator Max Energy (Value in EU)")
|
@ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorMaxEnergy", comment = "Matter Fabricator Max Energy (Value in EU)")
|
||||||
public static int maxEnergy = 100000000;
|
public static int maxEnergy = 100000000;
|
||||||
@ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorFabricationRate", comment = "Matter Fabricator Fabrication Rate")
|
@ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorFabricationRate", comment = "Matter Fabricator Fabrication Rate, amount of amplifier units per UUM")
|
||||||
public static int fabricationRate = 10000;
|
public static int fabricationRate = 10000;
|
||||||
|
@ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorEnergyPerAmp", comment = "Matter Fabricator EU per amplifier unit, multiply this with the rate for total EU")
|
||||||
|
public static int energyPerAmp = 1666;
|
||||||
// @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorWrenchDropRate", comment = "Matter Fabricator Wrench Drop Rate")
|
// @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorWrenchDropRate", comment = "Matter Fabricator Wrench Drop Rate")
|
||||||
public static float wrenchDropRate = 1.0F;
|
public static float wrenchDropRate = 1.0F;
|
||||||
|
|
||||||
|
@ -100,14 +102,14 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
||||||
if (slotIndex == 6)
|
if (slotIndex >= 6)
|
||||||
return false;
|
return false;
|
||||||
return isItemValidForSlot(slotIndex, itemStack);
|
return isItemValidForSlot(slotIndex, itemStack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
||||||
return slotIndex == 6;
|
return slotIndex >= 6 && slotIndex <= 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -119,8 +121,9 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
||||||
final ItemStack stack = this.inventory.getStackInSlot(i);
|
final ItemStack stack = this.inventory.getStackInSlot(i);
|
||||||
if (!stack.isEmpty() && spaceForOutput()) {
|
if (!stack.isEmpty() && spaceForOutput()) {
|
||||||
final int amp = this.getValue(stack);
|
final int amp = this.getValue(stack);
|
||||||
if (amp != 0 && this.canUseEnergy(85)) {
|
final int euNeeded = amp * energyPerAmp;
|
||||||
this.useEnergy(85);
|
if (amp != 0 && this.canUseEnergy(euNeeded)) {
|
||||||
|
this.useEnergy(euNeeded);
|
||||||
this.amplifier += amp;
|
this.amplifier += amp;
|
||||||
this.inventory.decrStackSize(i, 1);
|
this.inventory.decrStackSize(i, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,7 +118,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) {
|
public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) {
|
||||||
return new ItemStack(ModBlocks.ALLOY_SMELTER, 1);
|
return new ItemStack(ModBlocks.VACUUM_FREEZER, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Reference in a new issue