Fix fluid containers

This commit is contained in:
Nedelosk committed 2017-01-25 20:58:11 +01:00
1 parent cdea827464
commit 923d3791cd
49 files changed
+397 -268

No files matched your search

@@ -1,18 +1,18 @@
package binnie.genetics.item;
import binnie.Binnie;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import binnie.genetics.Genetics;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum GeneticLiquid implements IFluidType {
GrowthMedium("Growth Medium", "growthMedium", 15460533),
GrowthMedium("Growth Medium", "growth.medium", 15460533),
Bacteria("Bacteria", "bacteria", 14203521),
BacteriaPoly("Polymerising Bacteria", "bacteriaPoly", 11443396),
BacteriaPoly("Polymerising Bacteria", "bacteria.poly", 11443396),
RawDNA("Raw DNA", "dna.raw", 15089129),
BacteriaVector("Bacteria Vector", "bacteriaVector", 15960958);
BacteriaVector("Bacteria Vector", "bacteria.vector", 15960958);
String name;
String ident;
@@ -34,16 +34,16 @@ public enum GeneticLiquid implements IFluidType {
@Override
public ResourceLocation getFlowing() {
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident);
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident.replace(".", "_"));
}
@Override
public ResourceLocation getStill() {
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident);
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident.replace(".", "_"));
}
@Override
public String getName() {
public String getDisplayName() {
return this.name;
}
@@ -73,12 +73,12 @@ public enum GeneticLiquid implements IFluidType {
}
@Override
public boolean canPlaceIn(final FluidContainer container) {
return this == GeneticLiquid.GrowthMedium || container == FluidContainer.Cylinder;
public boolean canPlaceIn(final FluidContainerType container) {
return this == GeneticLiquid.GrowthMedium || container == FluidContainerType.CYLINDER;
}
@Override
public boolean showInCreative(final FluidContainer container) {
return container == FluidContainer.Cylinder;
public boolean showInCreative(final FluidContainerType container) {
return container == FluidContainerType.CYLINDER;
}
}
@@ -58,7 +58,7 @@ public class ModuleItem implements IInitializable {
Genetics.proxy.registerItem(Genetics.registry);
Genetics.proxy.registerItem(Genetics.masterRegistry);
Binnie.LIQUID.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics);
Binnie.LIQUID.createLiquids(GeneticLiquid.values());
}
@Override
@@ -4,7 +4,7 @@ import binnie.Binnie;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.core.BinnieCore;
import binnie.core.genetics.Tolerance;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
@@ -102,11 +102,11 @@ public class Acclimatiser {
addTemperatureItem(new ItemStack(Blocks.ICE), -0.75f);
addHumidityItem(new ItemStack(Items.WATER_BUCKET), 0.75f);
addHumidityItem(new ItemStack(Blocks.SAND), -0.15f);
addTemperatureItem(FluidContainer.Can.getFilled(FluidRegistry.LAVA), 0.75f);
addTemperatureItem(FluidContainer.Refractory.getFilled(FluidRegistry.LAVA), 0.75f);
addHumidityItem(FluidContainer.Can.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Refractory.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Capsule.getFilled(FluidRegistry.WATER), 0.75f);
addTemperatureItem(FluidContainerType.CAN.getFilled(FluidRegistry.LAVA), 0.75f);
addTemperatureItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.LAVA), 0.75f);
addHumidityItem(FluidContainerType.CAN.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainerType.CAPSULE.getFilled(FluidRegistry.WATER), 0.75f);
}
public static boolean canAcclimatise(final ItemStack stack, final List<ItemStack> acclimatisers) {
@@ -93,7 +93,7 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme
@Override
public String getTooltip() {
return GeneticLiquid.BacteriaVector.getName();
return GeneticLiquid.BacteriaVector.getDisplayName();
}
});
}