aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/eio
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-09-04 03:05:22 +0100
committerGitHub <noreply@github.com>2023-09-04 03:05:22 +0100
commit76719d65a90d98e228a914774d3b11ed9f01ac8e (patch)
treece0d35f954e441e9cc4aa95aa347073728e6f4ee /src/main/java/gtPlusPlus/xmod/eio
parent0393b582eb3edcb5c575330804b6747577a55e27 (diff)
downloadGT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.tar.gz
GT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.tar.bz2
GT5-Unofficial-76719d65a90d98e228a914774d3b11ed9f01ac8e.zip
Clean-up v2 (#729)
* Remove test items from NEI with no texture * Add number formatting to hand pumps * Remove heavy plates (no recipes & completely unused). * Remove helium generator (no texture, no recipe) * Remove fire pit and fire starter (no use, no recipe, no textures) * Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore. * Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why? * Remove trade bench, no recipe, missing textures. Unused. * Remove farm processors, no texture, no recipe. Unused. * Remove MAX tier components, these exist in GT now, have no recipe here and are unused. * Hide untextured light block from NEI * Update buildscript * Remove unused backpacks, no recipe and contains dupe bugs. Bad. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2 * Remove dragon catcher (what?), no texture, no recipe, unused. * Remove empty item, does nothing, has no recipe, no idea why it is here. * Empty item v2 removal * Revert "Empty item v2 removal" This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d. * Revert "Remove empty item, does nothing, has no recipe, no idea why it is here." This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36. * Remove debug square. No recipe, unused. * Number formatting overflow covers * Remove JVM garbage collection block. Unused, no recipe. * Remove nanotubes, no recipe for them. Unused. * Remove "git" item, doesn't seem to work. Has no recipe. * Remove uncraftable food with awful textures. * Remove "bat king" mob, unused content. Does not spawn. * Remove uncraftable doors with bad textures. Unused content. * Remove uncraftable, unlocalised redstone stuff that crashes game when placed. * Remove weird spawner item. No recipe, does not exist in world. * Remove sunnarium bit, no recipe, no usage. * Remove unused modularity table and some misc uncraftable, unused items. * Remove Interconnecting Storage Crate, no recipe, unused. * Delete worse debug power gen, this already exists as part of GT. Unneeded duplication. * Delete unused placeholder circuit * Delete uncraftable generator hatches. * Spotless * Remove XP tank thing, unused and uncraftable. * Remove null item, this fluid registry only seemed to register one null fluid. All others exist? * Remove EU -> RF battery. Unused in GTNH. * Remove some shelf nonsense, why is this in this mod? * Remove some weird random tools. These have no realistic usage in GTNH. * Remove firemaker. Useless in GTNH. * Removed helium blob. Deprecated item, not used anymore, uncraftable. * spotlessApply (#730) Co-authored-by: GitHub GTNH Actions <> * Stop modulators generating unused blocks with no textures * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock. * spotlessApply (#732) Co-authored-by: GitHub GTNH Actions <> * Remove gem shards, unused. * Remove unused atoms * Remove unused gum * Remove unused elements/materials * Bye bye * Remove some unused reflection stuff * Remove control cores, obsolete now. * Remove mob killing thing with no texture and no recipe. * Remove uncraftable covers * Remove pizza gloves * Net and rope removal, unused * Remove force crop * Removal of some old event stuff * Remove unused nuclear chem items * Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord. * Remove Force material and associated other nonsense. Also remove some nuclear chem stuff. * Remove force for realsies * Skookum Chooker purge. * Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete. * spotlessApply (#733) Co-authored-by: GitHub GTNH Actions <> * Unused textures * Bump dep * Revert "Remove force for realsies" This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e. * Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff." This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b. * Remove nuclear items that are unused * spotlessApply (#734) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/eio')
-rw-r--r--src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java76
-rw-r--r--src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java109
2 files changed, 0 insertions, 185 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
deleted file mode 100644
index caa49973d7..0000000000
--- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package gtPlusPlus.xmod.eio.handler;
-
-import static gregtech.api.enums.Mods.EnderIO;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips;
-
-import java.lang.reflect.Field;
-
-import net.minecraft.item.Item;
-import net.minecraftforge.event.entity.player.ItemTooltipEvent;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.eio.material.MaterialEIO;
-
-public class HandlerTooltip_EIO {
-
- private static Item mIngot;
- Class oMainClass;
- Class oIngotClass;
-
- @SubscribeEvent
- public void onItemTooltip(ItemTooltipEvent event) {
- // Is EIO loaded?
- if (!disableEnderIOIngotTooltips && EnderIO.isModLoaded()) {
-
- // Is the EIO Ingot Item null?
- // If it is, reflect in.
- if (mIngot == null) {
- try {
- oMainClass = ReflectionUtils.getClass("crazypants.enderio.EnderIO");
- oIngotClass = ReflectionUtils.getClass("crazypants.enderio.material.ItemAlloy");
- if (oMainClass != null && oIngotClass != null) {
- Field oAlloyField = ReflectionUtils.getField(oMainClass, "itemAlloy");
- Object oAlloy = oAlloyField.get(oMainClass);
- if (oAlloy != null) {
- if (oIngotClass.isInstance(oAlloy) || Item.class.isInstance(oAlloy)) {
- mIngot = (Item) oAlloy;
- }
- }
- }
- } catch (Throwable e) {}
- }
-
- if (mIngot != null) {
- // If the Item is an instance of ItemAlloy.class then proceed
- if (event.itemStack.getItem() == mIngot || oIngotClass.isInstance(event.itemStack.getItem())
- || event.itemStack.getUnlocalizedName().toLowerCase().contains("item.itemAlloy")) {
-
- // If stacks match, add a tooltip.
- if (mIngot != null) {
- if (event.itemStack.getItem() == mIngot) {
- if (event.itemStack.getItemDamage() == 0) {
- event.toolTip.add(MaterialEIO.ELECTRICAL_STEEL.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 1) {
- event.toolTip.add(MaterialEIO.ENERGETIC_ALLOY.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 2) {
- event.toolTip.add(MaterialEIO.VIBRANT_ALLOY.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 3) {
- event.toolTip.add(MaterialEIO.REDSTONE_ALLOY.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 4) {
- event.toolTip.add(MaterialEIO.CONDUCTIVE_IRON.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 5) {
- event.toolTip.add(MaterialEIO.PULSATING_IRON.vChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 6) {
- event.toolTip.add(Materials.DarkSteel.mChemicalFormula);
- } else if (event.itemStack.getItemDamage() == 7) {
- event.toolTip.add(MaterialEIO.SOULARIUM.vChemicalFormula);
- }
- }
- }
- }
- }
- }
- }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java
deleted file mode 100644
index 0d07901310..0000000000
--- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package gtPlusPlus.xmod.eio.material;
-
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.NONMATERIAL;
-import gtPlusPlus.core.material.state.MaterialState;
-
-public class MaterialEIO {
-
- public static final Material SOULARIUM = new Material(
- "Soularium", // Material Name
- MaterialState.SOLID, // State
- new short[] { 95, 90, 54, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- false, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1),
- new MaterialStack(NONMATERIAL.SOULSAND, 1) });
-
- public static final Material CONDUCTIVE_IRON = new Material(
- "Conductive Iron", // Material Name
- MaterialState.SOLID, // State
- new short[] { 164, 109, 100, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- false, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1),
- new MaterialStack(NONMATERIAL.REDSTONE, 1) });
-
- public static final Material PULSATING_IRON = new Material(
- "Pulsating Iron", // Material Name
- MaterialState.SOLID, // State
- new short[] { 50, 91, 21, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- false, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1),
- new MaterialStack(NONMATERIAL.ENDERPEARL, 1) });
-
- public static final Material ELECTRICAL_STEEL = new Material(
- "Electrical Steel", // Material Name
- MaterialState.SOLID, // State
- new short[] { 194, 194, 194, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- true, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 3),
- new MaterialStack(ELEMENT.getInstance().SILICON, 1) });
-
- public static final Material ENERGETIC_ALLOY = new Material(
- "Energetic Alloy", // Material Name
- MaterialState.SOLID, // State
- new short[] { 252, 151, 45, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- true, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1),
- new MaterialStack(NONMATERIAL.REDSTONE, 1), new MaterialStack(NONMATERIAL.GLOWSTONE, 1) });
-
- public static final Material VIBRANT_ALLOY = new Material(
- "Vibrant Alloy", // Material Name
- MaterialState.SOLID, // State
- new short[] { 204, 242, 142, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- true, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ENERGETIC_ALLOY, 1),
- new MaterialStack(NONMATERIAL.ENDERPEARL, 1) });
-
- public static final Material REDSTONE_ALLOY = new Material(
- "Redstone Alloy", // Material Name
- MaterialState.SOLID, // State
- new short[] { 178, 34, 34, 0 }, // Material Colour
- 10, // Melting Point in C
- 10,
- 10,
- 10,
- false, // Uses Blast furnace?
- false, // Generates a cell
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 1),
- new MaterialStack(NONMATERIAL.REDSTONE, 1) });
-}