mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
coca cola, dont forget the ice!
fixed various strand caster problems
This commit is contained in:
parent
6609851903
commit
ea0447dfaa
@ -137,7 +137,6 @@ public class MachineStrandCaster extends BlockDummyable implements ICrucibleAcce
|
|||||||
player.getHeldItem().stackSize--;
|
player.getHeldItem().stackSize--;
|
||||||
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
|
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:item.upgradePlug", 1.0F, 1.0F);
|
||||||
cast.markDirty();
|
cast.markDirty();
|
||||||
world.markBlockForUpdate(x, y, z);
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -154,7 +153,6 @@ public class MachineStrandCaster extends BlockDummyable implements ICrucibleAcce
|
|||||||
cast.amount = 0;
|
cast.amount = 0;
|
||||||
cast.type = null;
|
cast.type = null;
|
||||||
cast.markDirty();
|
cast.markDirty();
|
||||||
world.markBlockForUpdate(x, y, z);
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -225,10 +223,8 @@ public class MachineStrandCaster extends BlockDummyable implements ICrucibleAcce
|
|||||||
}
|
}
|
||||||
|
|
||||||
cast.markDirty();
|
cast.markDirty();
|
||||||
world.markBlockForUpdate(x, y, z);
|
|
||||||
|
|
||||||
cast.slots[0] = null;
|
cast.slots[0] = null;
|
||||||
cast.markDirty();
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
package com.hbm.inventory.container;
|
package com.hbm.inventory.container;
|
||||||
|
|
||||||
|
import com.hbm.inventory.SlotCraftingOutput;
|
||||||
import com.hbm.inventory.SlotNonRetarded;
|
import com.hbm.inventory.SlotNonRetarded;
|
||||||
import com.hbm.tileentity.machine.TileEntityMachineStrandCaster;
|
import com.hbm.tileentity.machine.TileEntityMachineStrandCaster;
|
||||||
import com.hbm.util.InventoryUtil;
|
import com.hbm.util.InventoryUtil;
|
||||||
@ -22,7 +23,7 @@ public class ContainerMachineStrandCaster extends Container {
|
|||||||
//output
|
//output
|
||||||
for (int i = 0; i < 3; i++) {
|
for (int i = 0; i < 3; i++) {
|
||||||
for (int j = 0; j < 2; j++) {
|
for (int j = 0; j < 2; j++) {
|
||||||
this.addSlotToContainer(new SlotNonRetarded(this.caster, j + i * 2 + 1, 125 + j * 18, 26 + i * 18));
|
this.addSlotToContainer(new SlotCraftingOutput(invPlayer.player, this.caster, j + i * 2 + 1, 125 + j * 18, 26 + i * 18));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ public class ContainerMachineStrandCaster extends Container {
|
|||||||
|
|
||||||
slot.onSlotChange(originalStack, stack);
|
slot.onSlotChange(originalStack, stack);
|
||||||
|
|
||||||
} else if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 0, 7, false)) {
|
} else if (!InventoryUtil.mergeItemStack(this.inventorySlots, originalStack, 1, 2, false)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -52,7 +52,7 @@ public class ResourceManager {
|
|||||||
public static final IModelCustom hephaestus = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/hephaestus.obj"));
|
public static final IModelCustom hephaestus = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/hephaestus.obj"));
|
||||||
|
|
||||||
//Caster o' Strands
|
//Caster o' Strands
|
||||||
public static final IModelCustom strand_caster = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/strand_caster.obj"));
|
public static final IModelCustom strand_caster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/strand_caster.obj"));
|
||||||
|
|
||||||
//Furnaces
|
//Furnaces
|
||||||
public static final IModelCustom furnace_iron = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/furnace_iron.obj"));
|
public static final IModelCustom furnace_iron = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/furnace_iron.obj"));
|
||||||
|
|||||||
@ -12,11 +12,6 @@ public class TileEntityFoundryBasin extends TileEntityFoundryCastingBase impleme
|
|||||||
super(2);
|
super(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateEntity() {
|
public void updateEntity() {
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
|
|||||||
@ -26,9 +26,6 @@ public abstract class TileEntityFoundryCastingBase extends TileEntityFoundryBase
|
|||||||
}
|
}
|
||||||
public int cooloff = 100;
|
public int cooloff = 100;
|
||||||
|
|
||||||
|
|
||||||
public abstract String getName();
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateEntity() {
|
public void updateEntity() {
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
|
|||||||
@ -8,11 +8,6 @@ public class TileEntityFoundryMold extends TileEntityFoundryCastingBase implemen
|
|||||||
super(2);
|
super(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateEntity() {
|
public void updateEntity() {
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
|
|||||||
@ -37,7 +37,6 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
|
|||||||
public FluidTank water;
|
public FluidTank water;
|
||||||
public FluidTank steam;
|
public FluidTank steam;
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "container.machineStrandCaster";
|
return "container.machineStrandCaster";
|
||||||
}
|
}
|
||||||
@ -66,9 +65,10 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.amount >= this.getCapacity()) {
|
if (this.amount >= this.getCapacity()) {
|
||||||
|
//In case of overfill problems, spit out the excess as scrap
|
||||||
if (amount > getCapacity()) {
|
if (amount > getCapacity()) {
|
||||||
ItemStack scrap = ItemScraps.create(new Mats.MaterialStack(type, amount));
|
ItemStack scrap = ItemScraps.create(new Mats.MaterialStack(type, amount));
|
||||||
EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord, zCoord + 0.5, scrap);
|
EntityItem item = new EntityItem(worldObj, xCoord + 0.5, yCoord + 2, zCoord + 0.5, scrap);
|
||||||
worldObj.spawnEntityInWorld(item);
|
worldObj.spawnEntityInWorld(item);
|
||||||
}
|
}
|
||||||
this.amount = this.getCapacity();
|
this.amount = this.getCapacity();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user