aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/fluids
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-10-17 13:37:11 +0900
committermiozune <miozune@gmail.com>2023-10-17 17:39:55 +0900
commit325a5f154e8d8d7dac6c03deb632a0041b3d69ca (patch)
tree323c840a7478f6550ce6fac4606589a24f440f89 /src/main/java/gtPlusPlus/core/fluids
parent6f27cb977e0ff601a540e9dbfd3d7565d0b05273 (diff)
downloadGT5-Unofficial-325a5f154e8d8d7dac6c03deb632a0041b3d69ca.tar.gz
GT5-Unofficial-325a5f154e8d8d7dac6c03deb632a0041b3d69ca.tar.bz2
GT5-Unofficial-325a5f154e8d8d7dac6c03deb632a0041b3d69ca.zip
Remove unused classes
Diffstat (limited to 'src/main/java/gtPlusPlus/core/fluids')
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java106
-rw-r--r--src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java67
2 files changed, 0 insertions, 173 deletions
diff --git a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
deleted file mode 100644
index 9c4fb4d66a..0000000000
--- a/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package gtPlusPlus.core.fluids;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.Fluid;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.util.Utils;
-
-public class BlockFluidBase extends BlockFluidClassic {
-
- @SideOnly(Side.CLIENT)
- protected static IIcon stillIcon;
-
- @SideOnly(Side.CLIENT)
- protected static IIcon flowingIcon;
-
- protected final short[] mRGB;
-
- public BlockFluidBase(Fluid fluid, short[] aRGB) {
- this(fluid, Material.water, aRGB);
- }
-
- public BlockFluidBase(Fluid fluid, Material material, short[] aRGB) {
- super(fluid, material);
- mRGB = aRGB;
- this.setHardness(100.0F);
- this.setLightOpacity(3);
- this.disableStats();
- }
-
- @Override
- public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity ent) {
- if (!(ent instanceof EntityLivingBase)) {
- return;
- }
- /*
- * EntityLivingBase player = (EntityLivingBase) ent; int pot = world.rand.nextInt(Potion.potionTypes.length);
- * Potion.potionTypes[pot].performEffect(player, 40);
- */
- }
-
- @Override
- public IIcon getIcon(int ordinalSide, int meta) {
- return (ordinalSide == 0 || ordinalSide == 1) ? stillIcon : flowingIcon;
- }
-
- @SideOnly(Side.CLIENT)
- @Override
- public void registerBlockIcons(IIconRegister register) {
- if (stillIcon == null) {
- stillIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.still");
- }
- if (flowingIcon == null) {
- flowingIcon = register.registerIcon(GTPlusPlus.ID + ":" + "fluids/fluid.fluid.autogenerated.flowing");
- }
- }
-
- @Override
- public int getBlockColor() {
- if (mRGB != null && mRGB.length >= 3) {
- return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]);
- }
- return super.getBlockColor();
- }
-
- @Override
- public int getRenderColor(int aMeta) {
- if (mRGB != null && mRGB.length >= 3) {
- return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]);
- }
- return super.getRenderColor(aMeta);
- }
-
- @Override
- public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) {
- // TODO Auto-generated method stub
- return super.recolourBlock(world, x, y, z, side, colour);
- }
-
- @Override
- public boolean canDisplace(IBlockAccess world, int x, int y, int z) {
- if (world.getBlock(x, y, z).getMaterial().isLiquid()) {
- return false;
- }
- return super.canDisplace(world, x, y, z);
- }
-
- @Override
- public boolean displaceIfPossible(World world, int x, int y, int z) {
- if (world.getBlock(x, y, z).getMaterial().isLiquid()) {
- return false;
- }
- return super.displaceIfPossible(world, x, y, z);
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
deleted file mode 100644
index 96936cced8..0000000000
--- a/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gtPlusPlus.core.fluids;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.EnumRarity;
-import net.minecraftforge.fluids.Fluid;
-
-import gregtech.api.GregTech_API;
-
-public class FactoryFluid extends Fluid implements Runnable {
-
- private final String mTextureName;
- private final short[] mRGBa;
-
- public FactoryFluid(String fluidName, final short[] aRGBa) {
- this(
- fluidName,
- null,
- Short.MIN_VALUE,
- Short.MIN_VALUE,
- Short.MIN_VALUE,
- Short.MIN_VALUE,
- false,
- EnumRarity.common,
- aRGBa);
- }
-
- public FactoryFluid(String fluidName, int luminosity, int density, int temp, int viscosity, final short[] aRGBa) {
- this(
- fluidName,
- null,
- luminosity,
- density,
- temp,
- viscosity,
- (density == Short.MIN_VALUE || density >= 0 ? false : true),
- EnumRarity.common,
- aRGBa);
- }
-
- public FactoryFluid(String fluidName, Block aBlock, int luminosity, int density, int temp, int viscosity,
- boolean gas, EnumRarity aRarity, final short[] aRGBa) {
- super(fluidName);
- this.mRGBa = aRGBa;
- this.setBlock(aBlock);
- if (luminosity != Short.MIN_VALUE) this.setLuminosity(luminosity);
- if (density != Short.MIN_VALUE) this.setDensity(density);
- if (temp != Short.MIN_VALUE) this.setTemperature(temp);
- if (viscosity != Short.MIN_VALUE) this.setViscosity(viscosity);
- this.setGaseous(gas);
- this.setRarity(aRarity);
- this.mTextureName = GTPlusPlus.ID + ":fluids/fluid.fluid.autogenerated";
- GregTech_API.sGTBlockIconload.add(this);
- }
-
- @Override
- public int getColor() {
- return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8)
- | Math.max(0, Math.min(255, this.mRGBa[2]));
- }
-
- @Override
- public void run() {
- this.setIcons(GregTech_API.sBlockIcons.registerIcon(this.mTextureName));
- }
-}