aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-10 18:44:32 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-10-10 18:44:32 +0100
commit9c71ae70fc2276b4c56baa26217be2d23dde63b6 (patch)
treea409249e197be63c75b4822038ba04897c59009d /src/Java/gtPlusPlus/core
parentab84b1d95f8c4880891debc594a41f57941de78a (diff)
downloadGT5-Unofficial-9c71ae70fc2276b4c56baa26217be2d23dde63b6.tar.gz
GT5-Unofficial-9c71ae70fc2276b4c56baa26217be2d23dde63b6.tar.bz2
GT5-Unofficial-9c71ae70fc2276b4c56baa26217be2d23dde63b6.zip
+ Added OD tag 'rodBlaze' to blaze rods.
$ Corrected certain multiblocks not counting their casings during construction. Fixes #549. $ Stopped custom MTE's incorrectly handling getDrops(). Fixes #553. $ Stopped GT++ Multis trying to reduce the 'wait' time on themselves when placed or first loaded. Fixes #556.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/OilChem.java1
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java3
4 files changed, 1 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 87158fe4ee..fd0d044c05 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.item.chemistry;
import java.lang.reflect.Field;
import java.util.ArrayList;
-import forestry.plugins.PluginCore;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gtPlusPlus.api.objects.Logger;
@@ -393,7 +392,6 @@ public class AgriculturalChem extends ItemPackage {
@Override
public String errorMessage() {
- // TODO Auto-generated method stub
return "Failed to generate recipes for AgroChem.";
}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 0e21387c56..f5ddfa4dd9 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -335,7 +335,6 @@ public class CoalTar extends ItemPackage {
@Override
public String errorMessage() {
- // TODO Auto-generated method stub
return "Bad Coal Science!";
}
@@ -383,7 +382,6 @@ public class CoalTar extends ItemPackage {
@Override
public void blocks() {
- // TODO Auto-generated method stub
}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
index cb7e32eaf0..4fe9347324 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
@@ -177,7 +177,6 @@ public class OilChem extends ItemPackage {
@Override
public String errorMessage() {
- // TODO Auto-generated method stub
return "Failed to generate recipes for AgroChem.";
}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index a0eb0f17e2..ff60d8c416 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -15,7 +15,6 @@ import gtPlusPlus.core.item.base.BaseItemComponent;
import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.material.MaterialStack;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
@@ -206,7 +205,7 @@ public class FluidUtils {
ItemStack temp = null;
//Generate a Cell if we need to
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellPlasma"+aMaterial.getUnlocalizedName(), 1) == null){
- final Item temp2 = new BaseItemPlasmaCell(aMaterial);
+ new BaseItemPlasmaCell(aMaterial);
temp = aMaterial.getPlasmaCell(1);
}
else {