mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 03:25:07 +00:00
Clean Up Machines: Genetic
This commit is contained in:
1 parent
154207f60f
commit
489ce3dece
32 files changed
+185
-133
No files matched your search
@@ -31,6 +31,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -50,6 +51,10 @@ import java.util.List;
|
||||
@Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry")
|
||||
public final class BinnieCore extends AbstractMod {
|
||||
|
||||
public BinnieCore() {
|
||||
FluidRegistry.enableUniversalBucket();
|
||||
}
|
||||
|
||||
@Mod.Instance(Constants.CORE_MOD_ID)
|
||||
public static BinnieCore instance;
|
||||
@SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
|
||||
|
||||
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
|
||||
public enum FluidContainer {
|
||||
Bucket,
|
||||
Capsule,
|
||||
Refractory,
|
||||
Can,
|
||||
@@ -20,7 +19,7 @@ public enum FluidContainer {
|
||||
ItemFluidContainer item;
|
||||
|
||||
public int getMaxStackSize() {
|
||||
return (this == FluidContainer.Bucket) ? 1 : 16;
|
||||
return 16;
|
||||
}
|
||||
|
||||
// @SideOnly(Side.CLIENT)
|
||||
@@ -47,9 +46,6 @@ public enum FluidContainer {
|
||||
|
||||
public ItemStack getEmpty() {
|
||||
switch (this) {
|
||||
case Bucket: {
|
||||
return new ItemStack(Items.BUCKET, 1, 0);
|
||||
}
|
||||
case Can: {
|
||||
return Mods.Forestry.stack("canEmpty");
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ public class ManagerLiquid extends ManagerBase {
|
||||
final BinnieFluid bFluid = new BinnieFluid(fluid);
|
||||
FluidRegistry.registerFluid(bFluid);
|
||||
ItemFluidContainer.registerFluid(fluid, id);
|
||||
FluidRegistry.addBucketForFluid(bFluid);
|
||||
return bFluid;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package binnie.core.machines.power;
|
||||
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.machines.IMachine;
|
||||
import binnie.core.machines.MachineComponent;
|
||||
import binnie.core.machines.network.INetwork;
|
||||
@@ -73,13 +74,13 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
|
||||
|
||||
@Override
|
||||
public ErrorState canWork() {
|
||||
return (this.actionCancelTask == 0.0f) ? null : new ErrorState("Task Cancelled", "Cancelled by Buildcraft Gate");
|
||||
return (this.actionCancelTask == 0.0f) ? null : new ErrorState(BinnieCore.proxy.localise("machine.errors.task.cancelled.desc"), BinnieCore.proxy.localise("machine.errors.task.cancelled.info"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ErrorState canProgress() {
|
||||
if (this.actionPauseProcess != 0.0f) {
|
||||
return new ErrorState("Process Paused", "Paused by Buildcraft Gate");
|
||||
return new ErrorState(BinnieCore.proxy.localise("machine.errors.task.process.paused.desc"), BinnieCore.proxy.localise("machine.errors.task.process.paused.info"));
|
||||
}
|
||||
return (this.getPower().getInterface().getEnergy(PowerSystem.RF) < this.getEnergyPerTick()) ? new ErrorState.InsufficientPower() : null;
|
||||
}
|
||||
@@ -102,7 +103,7 @@ public abstract class ComponentProcessIndefinate extends MachineComponent implem
|
||||
|
||||
@Override
|
||||
public String getTooltip() {
|
||||
return "Processing";
|
||||
return BinnieCore.proxy.localise("machine.tooltips.processing");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
package binnie.core.util;
|
||||
|
||||
public class Fluids {
|
||||
|
||||
public static final String BIO_ETHANOL = "bio.ethanol";
|
||||
}
|
||||
Reference in new issue
Block a user