aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gregtech/api/util/Recipe_GT.java8
-rw-r--r--src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java10
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java4
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java39
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java3
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang2
9 files changed, 53 insertions, 20 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 4cee30a44a..c06b609391 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -993,7 +993,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if (mColumn <= 2 && mRow <= 3)
outputStacks.add(
(PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow]));
+ (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000)));
}
return outputStacks;
}
@@ -1160,7 +1160,7 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
if (mColumn <= 2 && mRow <= 3)
outputStacks.add(
(PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow]));
+ (Object) mNEIMap.get(i), xPos[mColumn++], yPos[mRow], ((this.mChances.length-1) >= i ? this.mChances[i] : 10000)));
}
return outputStacks;
}
@@ -1310,12 +1310,12 @@ public class Recipe_GT extends GT_Recipe implements IComparableRecipe{
for (int i = 0; i < itemLimit; ++i) {
if (this.mOutputs[i] != null)
outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) this.mOutputs[i].copy(), 102 + i * 18, 5));
+ (Object) this.mOutputs[i].copy(), 102 + i * 18, 5, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000)));
}
for (int i = 0; i < fluidLimit; ++i) {
if (this.mFluidOutputs[i] != null)
outputStacks.add((PositionedStack) new GT_NEI_MultiBlockHandler.FixedPositionedStack(
- (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23));
+ (Object) GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), 102 + i * 18, 23, ((this.mChances.length-1) >= i ? this.mChances[i] : 10000)));
}
return outputStacks;
}
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index aac26418b0..c323acf753 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.handler.events;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
import java.util.ArrayList;
-import java.util.Random;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -21,7 +20,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.event.world.BlockEvent;
public class BlockEventHandler {
- private final Random random = new Random();
public static ArrayList<ItemStack> oreLimestone;
public static ArrayList<ItemStack> blockLimestone;
public static ItemStack fluoriteOre;
@@ -115,14 +113,16 @@ public class BlockEventHandler {
ArrayList<Block> mBlockTypes = new ArrayList<Block>();
if (!oreLimestone.isEmpty()){
for (int i=0;i<oreLimestone.size();i++){
- if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
- mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+ if (ItemUtils.getModId(oreLimestone.get(i)) != null && !ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+ if (!mBlockTypes.contains(Block.getBlockFromItem(oreLimestone.get(i).getItem()))){
+ mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+ }
}
}
}
if (!blockLimestone.isEmpty()){
for (int i=0;i<blockLimestone.size();i++){
- if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+ if (ItemUtils.getModId(blockLimestone.get(i)) != null && !ItemUtils.getModId(blockLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){
mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem()));
}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 919ad74374..785b29ff61 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -515,8 +515,8 @@ public final class ModItems {
//Generate Fictional Materials
if (!CORE.GTNH) {
MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
- MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
}
+ MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);
@@ -585,7 +585,7 @@ public final class ModItems {
fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
//LFTR Control Circuit
- itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, new String[] {"Helps your LFTR not explode"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
+ itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0, new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
//Zirconium
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index f399e16cca..5bb82fc38e 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -152,14 +152,43 @@ public final class ELEMENT {
public ELEMENT(){
//GTNH Trinium Handling
- if (CORE.GTNH){
- TRINIUM = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterialByName("Trinium"));
- TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
+ if (CORE.GTNH){
+ //yay
+ Materials a1 = MaterialUtils.getMaterialByName("Trinium");
+ Materials a2 = Materials.valueOf("Trinium");
+ Materials a3 = Materials.get("Trinium");
+ Materials a4;
+ if (a1 == null) {
+ Logger.INFO("[Material] First attempt to find Trinium failed, using backup method.");
+ if (a2 == null) {
+ Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback.");
+ if (a3 == null) {
+ Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials.");
+ for (Materials m : Materials.values()) {
+ Logger.INFO("[Material] Found "+m.mName);
+ }
+ a4 = null;
+ }
+ else {
+ Logger.INFO("[Material] a3 Found "+a3.mName);
+ a4 = a3;
+ }
+ }
+ else {
+ Logger.INFO("[Material] a2 Found "+a2.mName);
+ a4 = a2;
+ }
+ TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4);
+ }
+ else {
+ Logger.INFO("[Material] a1 Found "+a1.mName);
+ TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1);
+ }
}
else {
TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material
- TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
- }
+ }
+ TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material
}
public static ELEMENT getInstance(){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 84db0bd7af..b182668539 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -769,7 +769,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("radon", 4000),
T5, 1000, 128000);
addAR(T5,
- ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateAlloyIridium", 4),
FluidUtils.getFluidStack("molten.krypton", 500),
T6, 2000, 512000);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 9682c673b6..58333cccda 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -642,6 +642,7 @@ public class ItemUtils {
}
}
catch (final Throwable t3){
+ t3.printStackTrace();
value = "bad modid";
}
}
diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
index c00eb5254a..c266d55cac 100644
--- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
+++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
@@ -133,7 +133,7 @@ public class HandlerTooltip_EIO {
if (!BlockEventHandler.blockLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.blockLimestone) {
if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
- if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
+ if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
event.toolTip.add("May contain Fluorite Ore");
}
}
@@ -142,7 +142,7 @@ public class HandlerTooltip_EIO {
if (!BlockEventHandler.oreLimestone.isEmpty()) {
for (ItemStack h : BlockEventHandler.oreLimestone) {
if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
- if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
+ if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
event.toolTip.add("May contain Fluorite Ore");
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 1bfe20810f..22522aeecc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -154,6 +154,7 @@ extends RenderPlayer {
}
private String getPlayerName(String name, String uuid) {
+ try {
Logger.WORLD("[Capes++] Trying to UUID check "+name+".");
if (uuid != null) {
if (uuid.length() > 0) {
@@ -179,6 +180,8 @@ extends RenderPlayer {
}
}
Logger.WORLD("[Capes++] Failed UUID check for "+name+".");
+ }
+ catch (Throwable t) {}
return name;
}
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index a59efde1c6..83867d3ddd 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -1466,7 +1466,7 @@ item.itemDustLi2BeF4.name=Li2BeF4 Fuel Compound Dust
item.itemDustSmallLi2BeF4.name=Small Pile of Li2BeF4 Fuel Compound Dust
item.itemDustTinyLi2BeF4.name=Tiny Pile of Li2BeF4 Fuel Compound Dust
item.Li2BeF4.name=Li2BeF4 Cell
-item.itemCircuitLFTR.name=§aThorium Reactor Control Circuit
+item.itemCircuitLFTR.name=§aControl Circuit
item.itemZirconiumPellet.name=Zirconium Pellet [ZrCl₄]
item.itemDustZrCl4.name=ZrCl4 Dust
item.itemDustSmallZrCl4.name=Small Pile of ZrCl4 Dust
generated by cgit (git 2.46.0) at 2025-03-10 10:08:57 +0000