diff options
Diffstat (limited to 'src/main/java/gregtech/api')
6 files changed, 82 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index a65f9eedb5..cdcc3b4a0f 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -301,6 +301,7 @@ public class GregTech_API { public static Block sBlockGlass1; public static Block sBlockTintedGlass; public static Block sLaserRender; + public static Block sWormholeRender; /** * Getting assigned by the Config */ diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 1f5d223a6b..57a44373b6 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2040,6 +2040,8 @@ public enum ItemList implements IItemContainer { TierdDrone1, TierdDrone2, Hatch_DroneDownLink, + Casing_Shielded_Accelerator, + WormholeGenerator, Hatch_pHSensor, Hatch_LensHousing, Hatch_LensIndicator, @@ -2069,7 +2071,6 @@ public enum ItemList implements IItemContainer { Quark_Creation_Catalyst_Bottom, Quark_Creation_Catalyst_Top, Quark_Creation_Catalyst_Unaligned, - Casing_Shielded_Accelerator, GlassOmniPurposeInfinityFused, GlassQuarkContainment, BlockQuarkPipe, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 78bc31ec57..de74b51806 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -701,7 +701,8 @@ public enum MetaTileEntityIDs { sofc2(13102), tfft(13104), lsc(13106), - tfftHatch(13109); + tfftHatch(13109), + WORMHOLE_GENERATOR_CONTROLLER(13115); public final int ID; diff --git a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java index 41ea858fec..5844a49180 100644 --- a/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java +++ b/src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java @@ -155,5 +155,6 @@ public final class CheckRecipeResultRegistry { register(new ResultInsufficientMachineTier(0)); register(new ResultInsufficientStartupPower(0)); register(new ResultInsufficientStartupPowerBigInt(BigInteger.ZERO)); + register(new ResultMissingItem()); } } diff --git a/src/main/java/gregtech/api/recipe/check/ResultMissingItem.java b/src/main/java/gregtech/api/recipe/check/ResultMissingItem.java new file mode 100644 index 0000000000..868d664109 --- /dev/null +++ b/src/main/java/gregtech/api/recipe/check/ResultMissingItem.java @@ -0,0 +1,60 @@ +package gregtech.api.recipe.check; + +import java.util.Objects; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import cpw.mods.fml.common.network.ByteBufUtils; + +public class ResultMissingItem implements CheckRecipeResult { + + @Nullable + public ItemStack itemStack; + + public ResultMissingItem() { + + } + + public ResultMissingItem(@Nullable ItemStack itemStack) { + this.itemStack = itemStack; + } + + @Override + @Nonnull + public String getID() { + return "missing_item"; + } + + @Override + public boolean wasSuccessful() { + return false; + } + + @Override + @Nonnull + public String getDisplayString() { + return Objects.requireNonNull( + I18n.format("GT5U.gui.text.missing_item", itemStack != null ? itemStack.getDisplayName() : "null")); + } + + @Override + @Nonnull + public CheckRecipeResult newInstance() { + return new ResultMissingItem(itemStack != null ? itemStack.copy() : null); + } + + @Override + public void encode(@Nonnull PacketBuffer buffer) { + ByteBufUtils.writeItemStack(buffer, itemStack); + } + + @Override + public void decode(PacketBuffer buffer) { + this.itemStack = ByteBufUtils.readItemStack(buffer); + } +} diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index c0f7413995..581c22852e 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -3489,6 +3489,7 @@ public class GT_Utility { EnumChatFormatting.GOLD + GT_Utility.trans("166", "Is valid Beacon Pyramid Material") + EnumChatFormatting.RESET); } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this block's info.§r")); if (D1) e.printStackTrace(GT_Log.err); } } @@ -3517,6 +3518,7 @@ public class GT_Utility { } } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this tile's fluid tank info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3532,6 +3534,7 @@ public class GT_Utility { if (temp != null) tList.addAll(temp); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this block's debug info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3585,6 +3588,7 @@ public class GT_Utility { } } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this leaves' info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3636,6 +3640,7 @@ public class GT_Utility { } } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this crop's info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3647,6 +3652,7 @@ public class GT_Utility { tList.addAll(Arrays.asList(info.getInfoData())); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's info.§r")); if (D1) e.printStackTrace(GT_Log.err); } } @@ -3660,6 +3666,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's owner.§r")); if (D1) e.printStackTrace(GT_Log.err); } } @@ -3702,6 +3709,7 @@ public class GT_Utility { + " EU"); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's energy info.§r")); if (D1) e.printStackTrace(GT_Log.err); } } @@ -3716,6 +3724,7 @@ public class GT_Utility { if (tString != null && !tString.equals(E)) tList.add(tString); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's covers.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3747,6 +3756,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's progress.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3762,6 +3772,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's upgrades.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3783,6 +3794,7 @@ public class GT_Utility { + " EU"); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's IC2 energy info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3799,6 +3811,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's EU conduction info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3826,6 +3839,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3845,6 +3859,7 @@ public class GT_Utility { } } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this device's alignment info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; @@ -3869,6 +3884,7 @@ public class GT_Utility { + EnumChatFormatting.RESET); } } catch (Throwable e) { + tList.add(String.format("§cAn exception was thrown while fetching this reactor's info.§r")); if (D1) e.printStackTrace(GT_Log.err); } return rEUAmount; |