diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-07-18 04:58:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 15:58:35 +0700 |
| commit | 1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8 (patch) | |
| tree | 5028aab9a20d65cdf7e7d3ac88a4dea91116971f /src/main/java/gregtech/api/enums | |
| parent | de36e0a3fb2035c862b282440b23f4a6e2b6d392 (diff) | |
| download | GT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.tar.gz GT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.tar.bz2 GT5-Unofficial-1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8.zip | |
Add a multiblock for Fluid Canner/Canner (#2729)
* Ported changes from canner-dev branch because I have thoroughly messed up my branch management.
* Renamed multi, fixed textures, spotless
Diffstat (limited to 'src/main/java/gregtech/api/enums')
4 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index bb5bf1f3e7..f7314f6059 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -650,6 +650,7 @@ public class GT_Values { public static final String AuthorQuerns = "Author: " + EnumChatFormatting.RED + "Querns"; public static final String AuthorSilverMoon = "Author: " + EnumChatFormatting.AQUA + "SilverMoon"; public static final String AuthorTheEpicGamer274 = "Author: " + "TheEpicGamer274"; + public static final String AuthorFourIsTheNumber = "Author: " + EnumChatFormatting.LIGHT_PURPLE + "FourIsTheNumber"; // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 03446092fc..0aa953483f 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1451,6 +1451,8 @@ public enum ItemList implements IItemContainer { Machine_Multi_LargeChemicalReactor, + Machine_Multi_Canner, + Machine_LV_Miner, Machine_MV_Miner, Machine_HV_Miner, diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index d32cb781e2..73e79e4452 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -315,6 +315,7 @@ public enum MetaTileEntityIDs { WIREMILL_IV(355), PCB_FACTORY_CONTROLLER(356), NANO_FORGE_CONTROLLER(357), + MULTI_CANNER_CONTROLLER(360), CENTRIFUGE_LV(361), CENTRIFUGE_MV(362), CENTRIFUGE_HV(363), diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index c448ecd654..05689c1148 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -313,6 +313,11 @@ public class Textures { MACHINE_CASING_VENT, MACHINE_CASING_VENT_T2, + OVERLAY_FRONT_MULTI_CANNER, + OVERLAY_FRONT_MULTI_CANNER_ACTIVE, + OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW, + OVERLAY_FRONT_MULTI_CANNER_GLOW, + MACHINE_CASING_RADIATIONPROOF, MACHINE_CASING_ADVANCEDRADIATIONPROOF, MACHINE_CASING_FIREBOX_BRONZE, |