Merged all ingredients into single class
This commit is contained in:
parent
0b1733b733
commit
33b9f697dc
40 changed files with 258 additions and 1072 deletions
|
@ -39,7 +39,7 @@ import techreborn.client.container.builder.BuiltContainer;
|
|||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.init.ModParts;
|
||||
import techreborn.init.TRIngredients;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||
|
@ -73,7 +73,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
|||
|
||||
private boolean spaceForOutput(int slot) {
|
||||
return inventory.getStackInSlot(slot).isEmpty()
|
||||
|| ItemUtils.isItemEqual(inventory.getStackInSlot(slot), ModParts.UU_MATTER.getStack(), true, true)
|
||||
|| ItemUtils.isItemEqual(inventory.getStackInSlot(slot), TRIngredients.Parts.UU_MATTER.getStack(), true, true)
|
||||
&& inventory.getStackInSlot(slot).getCount() < 64;
|
||||
}
|
||||
|
||||
|
@ -88,9 +88,9 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
|||
|
||||
private void addOutputProducts(int slot) {
|
||||
if (inventory.getStackInSlot(slot).isEmpty()) {
|
||||
inventory.setInventorySlotContents(slot, ModParts.UU_MATTER.getStack());
|
||||
inventory.setInventorySlotContents(slot, TRIngredients.Parts.UU_MATTER.getStack());
|
||||
}
|
||||
else if (ItemUtils.isItemEqual(this.inventory.getStackInSlot(slot), ModParts.UU_MATTER.getStack(), true, true)) {
|
||||
else if (ItemUtils.isItemEqual(this.inventory.getStackInSlot(slot), TRIngredients.Parts.UU_MATTER.getStack(), true, true)) {
|
||||
inventory.getStackInSlot(slot).setCount((Math.min(64, 1 + inventory.getStackInSlot(slot).getCount())));
|
||||
}
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
|
|||
}
|
||||
|
||||
public int getValue(ItemStack itemStack) {
|
||||
if (itemStack.isItemEqual(ModParts.SCRAP.getStack())) {
|
||||
if (itemStack.isItemEqual(TRIngredients.Parts.SCRAP.getStack())) {
|
||||
return 200;
|
||||
} else if (itemStack.getItem() == ModItems.SCRAP_BOX) {
|
||||
return 2000;
|
||||
|
|
|
@ -42,8 +42,7 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.init.ModParts;
|
||||
import techreborn.init.TRIngredients;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.tiles.TileGenericMachine;
|
||||
|
||||
|
@ -145,7 +144,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
|
|||
@Override
|
||||
public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == 0) {
|
||||
if (itemStack.isItemEqual(ModParts.UU_MATTER.getStack())) {
|
||||
if (itemStack.isItemEqual(TRIngredients.Parts.UU_MATTER.getStack())) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
@ -158,7 +157,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine
|
|||
@Override
|
||||
public BuiltContainer createContainer(EntityPlayer player) {
|
||||
return new ContainerBuilder("fluidreplicator").player(player.inventory).inventory().hotbar().addInventory()
|
||||
.tile(this).fluidSlot(1, 124, 35).filterSlot(0, 55, 45, stack -> stack.isItemEqual(ModParts.UU_MATTER.getStack()))
|
||||
.tile(this).fluidSlot(1, 124, 35).filterSlot(0, 55, 45, stack -> stack.isItemEqual(TRIngredients.Parts.UU_MATTER.getStack()))
|
||||
.outputSlot(2, 124, 55).energySlot(3, 8, 72).syncEnergyValue().syncCrafterValue().addInventory()
|
||||
.create(this);
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModParts;
|
||||
import techreborn.init.TRIngredients;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||
|
@ -75,7 +75,7 @@ public class TileRecycler extends TilePowerAcceptor
|
|||
}
|
||||
|
||||
public void recycleItems() {
|
||||
final ItemStack itemstack = ModParts.SCRAP.getStack();
|
||||
final ItemStack itemstack = TRIngredients.Parts.SCRAP.getStack();
|
||||
final int randomchance = this.world.rand.nextInt(chance);
|
||||
|
||||
if (randomchance == 1) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue