aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-11-24 13:50:31 +1000
committerAlkalus <draknyte1@hotmail.com>2017-11-24 13:50:31 +1000
commit27a3675ced121616092334e68b8ae2719a86abaf (patch)
tree52a36d348762eb71e4a09ce8ff6442723eaa68a5 /src/Java/gtPlusPlus
parentbe05aadfba9659ec68219554ae96b81de5549034 (diff)
downloadGT5-Unofficial-27a3675ced121616092334e68b8ae2719a86abaf.tar.gz
GT5-Unofficial-27a3675ced121616092334e68b8ae2719a86abaf.tar.bz2
GT5-Unofficial-27a3675ced121616092334e68b8ae2719a86abaf.zip
% Refactored a package and class name.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java4
-rw-r--r--src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java12
-rw-r--r--src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java (renamed from src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java)4
-rw-r--r--src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java6
4 files changed, 13 insertions, 13 deletions
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index aa19556317..d9cbfc9fe5 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -8,7 +8,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.itemblock.ItemBlockEntityBase;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.tileentities.general.TileEntityXpConverter;
-import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
+import gtPlusPlus.core.util.enchanting.EnchantingUtils;
import gtPlusPlus.core.util.player.PlayerUtils;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@@ -75,7 +75,7 @@ public class BlockTankXpConverter extends BlockContainer {
PlayerUtils.messagePlayer(player, "This tank contains "+tank.tankLiquidXp.getFluidAmount()+"L of "+tank.tankLiquidXp.getFluid().getLocalizedName());
}
if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)){
- PlayerUtils.messagePlayer(player, "This is worth "+EnchantmentUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()));
+ PlayerUtils.messagePlayer(player, "This is worth "+EnchantingUtils.getLevelForLiquid(tank.tankLiquidXp.getFluidAmount()));
}
}
}
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
index 990304cf07..ca190802dc 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java
@@ -1,6 +1,6 @@
package gtPlusPlus.core.tileentities.general;
-import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
+import gtPlusPlus.core.util.enchanting.EnchantingUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
@@ -16,7 +16,7 @@ import net.minecraftforge.fluids.IFluidHandler;
public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
- public FluidTank tankEssence = new FluidTank((int) (64000*EnchantmentUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP));
+ public FluidTank tankEssence = new FluidTank((int) (64000*EnchantingUtils.RATIO_MOB_ESSENCE_TO_LIQUID_XP));
public FluidTank tankLiquidXp = new FluidTank(64000);
private boolean needsUpdate = false;
private int updateTimer = 0;
@@ -27,10 +27,10 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
@Override
public int fill(final ForgeDirection from, final FluidStack resource, final boolean doFill) {
this.needsUpdate = true;
- if (resource.isFluidEqual(EnchantmentUtils.getLiquidXP(1))){
+ if (resource.isFluidEqual(EnchantingUtils.getLiquidXP(1))){
return this.tankLiquidXp.fill(resource, doFill);
}
- else if (resource.isFluidEqual(EnchantmentUtils.getMobEssence(1))){
+ else if (resource.isFluidEqual(EnchantingUtils.getMobEssence(1))){
return this.tankEssence.fill(resource, doFill);
}
else {
@@ -41,10 +41,10 @@ public class TileEntityXpConverter extends TileEntity implements IFluidHandler {
@Override
public FluidStack drain(final ForgeDirection from, final FluidStack resource, final boolean doDrain) {
this.needsUpdate = true;
- if (resource.isFluidEqual(EnchantmentUtils.getLiquidXP(1))){
+ if (resource.isFluidEqual(EnchantingUtils.getLiquidXP(1))){
return this.tankLiquidXp.drain(resource.amount, doDrain);
}
- else if (resource.isFluidEqual(EnchantmentUtils.getMobEssence(1))){
+ else if (resource.isFluidEqual(EnchantingUtils.getMobEssence(1))){
return this.tankEssence.drain(resource.amount, doDrain);
}
else {
diff --git a/src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java b/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java
index 49c625685c..76336d4298 100644
--- a/src/Java/gtPlusPlus/core/util/enchantment/EnchantmentUtils.java
+++ b/src/Java/gtPlusPlus/core/util/enchanting/EnchantingUtils.java
@@ -1,10 +1,10 @@
-package gtPlusPlus.core.util.enchantment;
+package gtPlusPlus.core.util.enchanting;
import gtPlusPlus.core.util.Utils;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-public class EnchantmentUtils {
+public class EnchantingUtils {
public static final int XP_PER_BOTTLE = 8;
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index b0b6102504..611c7fe897 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -11,7 +11,7 @@ import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialStack;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.enchantment.EnchantmentUtils;
+import gtPlusPlus.core.util.enchanting.EnchantingUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import net.minecraft.init.Items;
@@ -524,11 +524,11 @@ public class FluidUtils {
public static FluidStack getMobEssence(final int amount){
- return EnchantmentUtils.getMobEssence(amount);
+ return EnchantingUtils.getMobEssence(amount);
}
public static FluidStack getLiquidXP(final int amount){
- return EnchantmentUtils.getLiquidXP(amount);
+ return EnchantingUtils.getLiquidXP(amount);
}