aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorVolence <32358820+Volence@users.noreply.github.com>2024-07-31 13:04:23 -0400
committerGitHub <noreply@github.com>2024-08-01 00:04:23 +0700
commitb4ee66356b06d0fcc75654506ed67aa57755393b (patch)
treee79fb57466260353d5128c73ee01a3b18847a5fe /src/main/java/gregtech/api/enums
parent5c07f729139fff33afd43f2cdfc2ae7a1eb050e0 (diff)
downloadGT5-Unofficial-b4ee66356b06d0fcc75654506ed67aa57755393b.tar.gz
GT5-Unofficial-b4ee66356b06d0fcc75654506ed67aa57755393b.tar.bz2
GT5-Unofficial-b4ee66356b06d0fcc75654506ed67aa57755393b.zip
Add multi lathe (#2783)
* first few files outlining new lathe multi * MultiLathe: Attempt to add tiers based on pipes * MultiLathe: Added Item Pipe Casing blocks and tiers * MultiLathe: Finished Machine and its mechanics * MultiLathe: Add recipe map and recipes for new precision lathe mode * MultiLathe: Apply Spotless * Revert recipe map changes * remove a few more recipe additions * revert to basic lathe recipe map for the multi * fix imports and make them all explicit * remove a few more * imports, update tooltip info * Update src/main/java/gregtech/common/blocks/GT_Block_Casings11.java Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com> * Added to the texture list documentation for blocks --------- Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: Mary <33456283+FourIsTheNumber@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java1
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java11
-rw-r--r--src/main/java/gregtech/api/enums/MetaTileEntityIDs.java1
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java16
4 files changed, 28 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 4d7f380656..bda681dc75 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -665,6 +665,7 @@ public class GT_Values {
+ EnumChatFormatting.GOLD
+ EnumChatFormatting.BOLD
+ "Gold";
+ public static final String AuthorVolence = "Author: " + EnumChatFormatting.AQUA + "Volence";
// 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 ca1cf5e2a9..f024361c19 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1463,6 +1463,8 @@ public enum ItemList implements IItemContainer {
Machine_Multi_Canner,
+ Machine_Multi_Lathe,
+
Machine_LV_Miner,
Machine_MV_Miner,
Machine_HV_Miner,
@@ -1669,6 +1671,15 @@ public enum ItemList implements IItemContainer {
Casing_Tank_15,
Casing_Tank_0,
+ Casing_Item_Pipe_Tin,
+ Casing_Item_Pipe_Brass,
+ Casing_Item_Pipe_Electrum,
+ Casing_Item_Pipe_Platinum,
+ Casing_Item_Pipe_Osmium,
+ Casing_Item_Pipe_Quantium,
+ Casing_Item_Pipe_Fluxed_Electrum,
+ Casing_Item_Pipe_Black_Plutonium,
+
MobRep_LV,
MobRep_MV,
MobRep_HV,
diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
index 0222df057b..8abf07e1b1 100644
--- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
+++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
@@ -482,6 +482,7 @@ public enum MetaTileEntityIDs {
MINER_LV(679),
MINER_MV(680),
MINER_HV(681),
+ MULTI_LATHE_CONTROLLER(686),
BATTERY_CHARGER_4_BY_4_ULV(690),
BATTERY_CHARGER_4_BY_4_LV(691),
BATTERY_CHARGER_4_BY_4_MV(692),
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 33b8483a2d..ba13de2552 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -87,6 +87,15 @@ public class Textures {
MACHINE_CASING_TANK_14,
MACHINE_CASING_TANK_0,
+ MACHINE_CASING_ITEM_PIPE_TIN,
+ MACHINE_CASING_ITEM_PIPE_BRASS,
+ MACHINE_CASING_ITEM_PIPE_ELECTRUM,
+ MACHINE_CASING_ITEM_PIPE_PLATINUM,
+ MACHINE_CASING_ITEM_PIPE_OSMIUM,
+ MACHINE_CASING_ITEM_PIPE_QUANTIUM,
+ MACHINE_CASING_ITEM_PIPE_FLUXED_ELECTRUM,
+ MACHINE_CASING_ITEM_PIPE_BLACK_PLUTONIUM,
+
BLOCK_STEELEAF,
BLOCK_ICHORIUM,
BLOCK_FIRESTONE,
@@ -327,6 +336,11 @@ public class Textures {
OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW,
OVERLAY_FRONT_MULTI_CANNER_GLOW,
+ OVERLAY_FRONT_MULTI_LATHE,
+ OVERLAY_FRONT_MULTI_LATHE_ACTIVE,
+ OVERLAY_FRONT_MULTI_LATHE_ACTIVE_GLOW,
+ OVERLAY_FRONT_MULTI_LATHE_GLOW,
+
MACHINE_CASING_RADIATIONPROOF,
MACHINE_CASING_ADVANCEDRADIATIONPROOF,
MACHINE_CASING_FIREBOX_BRONZE,
@@ -1697,7 +1711,7 @@ public class Textures {
* page 1: 0-15 GT casing 5, 22-26 GS dyson swarm, 48-57 GT casing 8, 63 EMT, 80-95 GT reinforced blocks, 96 casing 2 meta 6, 97 error casing
* page 8: 0-111 TecTech, 112-127 GT casing 6
* page 12: 0-127 GlodBlock
- * page 16: 0-15 GT glass 1, 16-31 GT casing 9, 32-47 GT glass 2, 48-63 GT casing 10
+ * page 16: 0-15 GT glass 1, 16-31 GT casing 9, 32-47 GT glass 2, 48-63 GT casing 10, 64-79 GT casing 11
* page 42: 0-126 glee8e, 127 KekzTech LSC base
*/
// spotless:on