aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-08-29 11:15:21 -0400
committerGitHub <noreply@github.com>2024-08-29 17:15:21 +0200
commit03f8ac57b99f8fa26975151ad39cb1a78667db73 (patch)
tree1f61751081785526d26875383cc344be5ada9e32 /src/main/java/gregtech/common/blocks
parent7d3ddfa1a325d7b2f0248bc771a5c0dcbc6eb839 (diff)
downloadGT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.tar.gz
GT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.tar.bz2
GT5-Unofficial-03f8ac57b99f8fa26975151ad39cb1a78667db73.zip
Compressor Multiblock (#2861)
* Compressor boilerplate * Getting test structure working * Structure fixes * Implemented basic HIP and Black Hole structure elements complete with heat and black hole stabilization mechanics * Cooling glow, also HIP cools much slower than it heats * Got blue cooling texture working * spotless :3 * Force structure checks every 10 seconds like nano forge * Neutronium compressor recipemap created * Various strange changes attempting to get a neutronium compressor map working. Shelved for now * Absolutely going hog wild with neutronium testing * BIG RECIPE * Added Ollie author tag * Added a bunch of neutronium compressor recipes * Deeply cursed recipemap combining * Neutronium compressor structure * Black hole requirement for recipes established * Black hole implementation changed * Added black hole catalyzation * spotless * Removed neutronium compressor recipes from gt5u * Made eternal singularity work somehow * Boilerplate for new hatches * Tinkering * Split the multi in 4 * Fix refactor * Implemented the new black hole mechanic with catalysts. * Give speed bonuses/nerfs to recipes based on black hole. Shuffled some logic around * Imported real structures * Proper HIP implementation with heat sensor * Cut HIP mechanics from Neutronium * Restore Gangue for use in a black hole recipe * Made Gangue blocks load * sa+update deps * Added t1/t2 casings * Temporary casings for neutronium * SA from merge * Temporary HIP Textures * Temporary Black Hole textures * Support machinemode for black hole, support special value for compression * Don't let neutronium compressor do black hole recipes * Get all of the numbers in * Tooltip adjustments for readability * Casing fix and more tooltips * Correct structure tooltips * Improve legibility of HIP tooltip * 1 parallel per tier when overheated * Lost my privates * Fixed modern cast and imported the new textures * Removed very unnecessary logic * Nerf HIP parallels to 4 to make black hole better * Change all special value stuff to proper metadata --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings10.java32
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Glass1.java9
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Glass1.java21
3 files changed, 56 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java
index 9c9db0a7e9..1a0902da97 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings10.java
@@ -19,14 +19,33 @@ public class GT_Block_Casings10 extends GT_Block_Casings_Abstract {
super(GT_Item_Casings10.class, "gt.blockcasings10", GT_Material_Casings.INSTANCE, 16);
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "MagTech Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Laser Containment Casing");
-
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Quark Exclusion Casing");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Pressure Containment Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Electric Compressor Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Compression Pipe Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Neutronium Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Active Neutronium Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Neutronium Stabilization Casing");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Coolant Duct");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Heating Duct");
+ GT_LanguageManager
+ .addStringLocalization(getUnlocalizedName() + ".11.name", "Extreme Density Space-Bending Casing");
+ GT_LanguageManager
+ .addStringLocalization(getUnlocalizedName() + ".12.name", "Background Radiation Absorbent Casing");
ItemList.Casing_Electromagnetic_Separator.set(new ItemStack(this, 1, 0));
- ItemList.BlockQuarkContainmentCasing.set(new ItemStack(this, 1, 2));
ItemList.Casing_Laser.set(new ItemStack(this, 1, 1));
+ ItemList.BlockQuarkContainmentCasing.set(new ItemStack(this, 1, 2));
ItemList.Casing_Autoclave.set(new ItemStack(this, 1, 3));
+ ItemList.Compressor_Casing.set(new ItemStack(this, 1, 4));
+ ItemList.Compressor_Pipe_Casing.set(new ItemStack(this, 1, 5));
+ ItemList.Neutronium_Casing.set(new ItemStack(this, 1, 6));
+ ItemList.Neutronium_Active_Casing.set(new ItemStack(this, 1, 7));
+ ItemList.Neutronium_Stable_Casing.set(new ItemStack(this, 1, 8));
+ ItemList.Coolant_Duct_Casing.set(new ItemStack(this, 1, 9));
+ ItemList.Heating_Duct_Casing.set(new ItemStack(this, 1, 10));
+ ItemList.Extreme_Density_Casing.set(new ItemStack(this, 1, 11));
+ ItemList.Background_Radiation_Casing.set(new ItemStack(this, 1, 12));
}
@Override
@@ -42,6 +61,15 @@ public class GT_Block_Casings10 extends GT_Block_Casings_Abstract {
case 1 -> Textures.BlockIcons.MACHINE_CASING_LASER.getIcon();
case 2 -> Textures.BlockIcons.BLOCK_QUARK_CONTAINMENT_CASING.getIcon();
case 3 -> Textures.BlockIcons.MACHINE_CASING_AUTOCLAVE.getIcon();
+ case 4 -> Textures.BlockIcons.COMPRESSOR_CASING.getIcon();
+ case 5 -> Textures.BlockIcons.COMPRESSOR_PIPE_CASING.getIcon();
+ case 6 -> Textures.BlockIcons.NEUTRONIUM_CASING.getIcon();
+ case 7 -> Textures.BlockIcons.NEUTRONIUM_ACTIVE_CASING.getIcon();
+ case 8 -> Textures.BlockIcons.NEUTRONIUM_STABLE_CASING.getIcon();
+ case 9 -> Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon();
+ case 10 -> Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon();
+ case 11 -> Textures.BlockIcons.EXTREME_DENSITY_CASING.getIcon();
+ case 12 -> Textures.BlockIcons.RADIATION_ABSORBENT_CASING.getIcon();
default -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
};
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java b/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java
index 0665411259..2aa5613d11 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Glass1.java
@@ -26,20 +26,20 @@ public class GT_Block_Glass1 extends GT_Block_Casings_Abstract {
this.opaque = false;
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemical Grade Glass");
- GT_LanguageManager.addStringLocalization(
- getUnlocalizedName() + ".0.tooltip",
- "Able to resist the most extreme chemical conditions.");
-
GT_LanguageManager
.addStringLocalization(getUnlocalizedName() + ".1.name", "Electron-Permeable Neutronium Coated Glass");
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Omni-Purpose Infinity Fused Glass");
GT_LanguageManager
.addStringLocalization(getUnlocalizedName() + ".3.name", "Non-Photonic Matter Exclusion Glass");
+ GT_LanguageManager
+ .addStringLocalization(getUnlocalizedName() + ".4.name", "Hawking Radiation Realignment Focus");
ItemList.GlassPHResistant.set(new ItemStack(this, 1, 0));
ItemList.GlassUVResistant.set(new ItemStack(this, 1, 1));
ItemList.GlassOmniPurposeInfinityFused.set(new ItemStack(this, 1, 2));
ItemList.GlassQuarkContainment.set(new ItemStack(this, 1, 3));
+ ItemList.GlassQuarkContainment.set(new ItemStack(this, 1, 3));
+ ItemList.Hawking_Glass.set(new ItemStack(this, 1, 4));
}
@Override
@@ -77,6 +77,7 @@ public class GT_Block_Glass1 extends GT_Block_Casings_Abstract {
case 1 -> Textures.BlockIcons.NEUTRONIUM_COATED_UV_RESISTANT_GLASS.getIcon();
case 2 -> Textures.BlockIcons.OMNI_PURPOSE_INFINITY_FUSED_GLASS.getIcon();
case 3 -> Textures.BlockIcons.GLASS_QUARK_CONTAINMENT.getIcon();
+ case 4 -> Textures.BlockIcons.HAWKING_GLASS.getIcon();
default -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
};
}
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java b/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java
index 7fbb33ff6e..e8d0b6c236 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Glass1.java
@@ -1,6 +1,12 @@
package gregtech.common.blocks;
+import java.util.List;
+
import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+import gregtech.api.util.GT_LanguageManager;
/**
* The glass types are split into separate files because they are registered as regular blocks, and a regular block can
@@ -9,7 +15,22 @@ import net.minecraft.block.Block;
*/
public class GT_Item_Glass1 extends GT_Item_Casings_Abstract {
+ protected final String chemicalGlassTooltip = GT_LanguageManager.addStringLocalization(
+ getUnlocalizedName() + ".0.tooltip",
+ "Able to resist the most extreme chemical conditions.");
+ protected final String hawkingGlassTooltip = GT_LanguageManager.addStringLocalization(
+ getUnlocalizedName() + ".4.tooltip",
+ "Controls the outward flow of Hawking Radiation to stabilize a black hole.");
+
public GT_Item_Glass1(Block block) {
super(block);
}
+
+ @Override
+ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) {
+ switch (getDamage(aStack)) {
+ case 0 -> aList.add(chemicalGlassTooltip);
+ case 4 -> aList.add(hawkingGlassTooltip);
+ }
+ }
}