aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
author‭huajijam <strhuaji@gmail.com>2019-03-31 15:05:29 +0800
committer‭huajijam <strhuaji@gmail.com>2019-03-31 15:05:29 +0800
commit98649eab067e2ffd4c6983fe44f75b65ffb0954b (patch)
tree175a784ebbb965e397f091a3e20749f58c76a11f /src/Java/gtPlusPlus/core
parentb14ab1f1555d7e185b01a2787be00215d378803e (diff)
parentcbdea67a3b25bb5be210cb4f4f394ba71caee493 (diff)
downloadGT5-Unofficial-98649eab067e2ffd4c6983fe44f75b65ffb0954b.tar.gz
GT5-Unofficial-98649eab067e2ffd4c6983fe44f75b65ffb0954b.tar.bz2
GT5-Unofficial-98649eab067e2ffd4c6983fe44f75b65ffb0954b.zip
Automatic synchronization
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java14
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java23
2 files changed, 13 insertions, 24 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index eaa0905c93..ef3266fe75 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -13,12 +13,12 @@ public class BaseItemRod extends BaseItemComponent{
public BaseItemRod(final Material material) {
super(material, BaseItemComponent.ComponentTypes.ROD);
- this.addExtruderRecipe();
- this.addLatheRecipe();
+ this.addCutterRecipe(material);
+ this.addLatheRecipe(material);
}
- private void addExtruderRecipe(){
+ private void addCutterRecipe(Material material){
Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
final ItemStack stackStick = this.componentMaterial.getRod(1);
final ItemStack stackBolt = this.componentMaterial.getBolt(4);
@@ -29,20 +29,20 @@ public class BaseItemRod extends BaseItemComponent{
stackBolt,
null,
(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
- 4);
+ material.vVoltageMultiplier);
}
- private void addLatheRecipe(){
+ private void addLatheRecipe(Material material){
Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
ItemStack boltStack = this.componentMaterial.getIngot(1);
if (ItemUtils.checkForInvalidItems(boltStack)){
GT_Values.RA.addLatheRecipe(
boltStack,
ItemUtils.getSimpleStack(this),
- null,
+ material.getSmallDust(2),
(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
- 4);
+ material.vVoltageMultiplier);
}
}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index a7fc4507e8..743e4bedf1 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -1,26 +1,15 @@
package gtPlusPlus.core.util.minecraft;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-import com.google.common.collect.Lists;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.*;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.Element;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TextureSet;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -33,8 +22,8 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.data.EnumUtils;
import gtPlusPlus.core.util.data.StringUtils;
-import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class MaterialUtils {