fix errors, spotless, datagen refresh

GregTechCEu · Sep 26, 2024 · 6a2955b · 6a2955b
1 parent e7c07f2
commit 6a2955b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -5,7 +5,7 @@ dependencies {
     // Packages that aren't mods, and thus need to be included in the release files.
 
     api(shadow('org.jgrapht:jgrapht-core:1.5.2'))  // JGraphT 1.5.2
-    forgeRuntimeLibrary('org.jgrapht:jgrapht-core:1.5.2')
+    additionalRuntimeClasspath('org.jgrapht:jgrapht-core:1.5.2')
 
     // LDLib
     modApi(forge.ldlib.forge) { transitive = false }

diff --git a/gradle/scripts/jars.gradle b/gradle/scripts/jars.gradle
@@ -13,9 +13,6 @@ obfuscation {
     reobfuscate(tasks.named('slimJar'), sourceSets.main) {
         archiveClassifier = "slim"
     }
-    reobfuscate(tasks.named('shadowJar'), sourceSets.main) {
-        archiveClassifier = "shadow"
-    }
     reobfuscate(tasks.named('shadowJar'), sourceSets.main) {
         archiveClassifier = null
         archiveClassifier.convention(null)

diff --git a/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json b/src/generated/resources/assets/gtceu/compass/nodes/materials/chainsaw_head.json
@@ -5,7 +5,7 @@
   },
   "page": "gtceu:materials/chainsaw_head",
   "position": [
-    -250,
+    -300,
     250
   ],
   "section": "gtceu:materials"

diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json
@@ -5,4 +5,4 @@
     "gtceu:rubber_wood",
     "gtceu:stripped_rubber_wood"
   ]
-}
+}
diff --git a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json
@@ -1,5 +1,8 @@
 {
   "values": [
-    "gtceu:rubber_log"
+    "gtceu:rubber_log",
+    "gtceu:stripped_rubber_log",
+    "gtceu:rubber_wood",
+    "gtceu:stripped_rubber_wood"
   ]
 }
diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/PartAbility.java b/src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/PartAbility.java
@@ -48,8 +48,8 @@ public class PartAbility {
     public static final PartAbility TANK_VALVE = new PartAbility("tank_valve");
     public static final PartAbility PASSTHROUGH_HATCH = new PartAbility("passthrough_hatch");
     public static final PartAbility PARALLEL_HATCH = new PartAbility("parallel_hatch");
-    public static final PartAbility INPUT_LASER = new PartAbility("input_laser");
-    public static final PartAbility OUTPUT_LASER = new PartAbility("output_laser");
+    public static final PartAbility LASER_RECEPTION = new PartAbility("laser_reception");
+    public static final PartAbility LASER_TRANSMISSION = new PartAbility("laser_transmission");
 
     public static final PartAbility COMPUTATION_DATA_RECEPTION = new PartAbility("computation_data_reception");
     public static final PartAbility COMPUTATION_DATA_TRANSMISSION = new PartAbility("computation_data_transmission");

diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
@@ -29,6 +29,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.event.*;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
@@ -1183,17 +1183,17 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
             HV, EV, IV, LuV, ZPM, UV);
 
     public static final MachineDefinition[] LASER_INPUT_HATCH_256 = registerLaserHatch(IO.IN, 256,
-            PartAbility.INPUT_LASER);
+            PartAbility.LASER_RECEPTION);
     public static final MachineDefinition[] LASER_OUTPUT_HATCH_256 = registerLaserHatch(IO.OUT, 256,
-            PartAbility.OUTPUT_LASER);
+            PartAbility.LASER_TRANSMISSION);
     public static final MachineDefinition[] LASER_INPUT_HATCH_1024 = registerLaserHatch(IO.IN, 1024,
-            PartAbility.INPUT_LASER);
+            PartAbility.LASER_RECEPTION);
     public static final MachineDefinition[] LASER_OUTPUT_HATCH_1024 = registerLaserHatch(IO.OUT, 1024,
-            PartAbility.OUTPUT_LASER);
+            PartAbility.LASER_TRANSMISSION);
     public static final MachineDefinition[] LASER_INPUT_HATCH_4096 = registerLaserHatch(IO.IN, 4096,
-            PartAbility.INPUT_LASER);
+            PartAbility.LASER_RECEPTION);
     public static final MachineDefinition[] LASER_OUTPUT_HATCH_4096 = registerLaserHatch(IO.OUT, 4096,
-            PartAbility.OUTPUT_LASER);
+            PartAbility.LASER_TRANSMISSION);
 
     //////////////////////////////////////
     // ******* Multiblock *******//
@@ -2127,9 +2127,9 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
                                     .setMinGlobalLimited(PowerSubstationMachine.MIN_CASINGS)
                                     .or(autoAbilities(true, false, false))
                                     .or(abilities(PartAbility.INPUT_ENERGY, PartAbility.SUBSTATION_INPUT_ENERGY,
-                                            PartAbility.INPUT_LASER).setMinGlobalLimited(1))
+                                            PartAbility.LASER_RECEPTION).setMinGlobalLimited(1))
                                     .or(abilities(PartAbility.OUTPUT_ENERGY, PartAbility.SUBSTATION_OUTPUT_ENERGY,
-                                            PartAbility.OUTPUT_LASER).setMinGlobalLimited(1)))
+                                            PartAbility.LASER_TRANSMISSION).setMinGlobalLimited(1)))
                     .where('G', blocks(CASING_LAMINATED_GLASS.get()))
                     .where('B', Predicates.powerSubstationBatteries())
                     .build())

diff --git a/...va/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java b/...va/com/gregtechceu/gtceu/common/machine/multiblock/electric/ActiveTransformerMachine.java
@@ -128,7 +128,7 @@ private List<IMultiPart> getPrioritySortedParts() {
                 if (PartAbility.SUBSTATION_OUTPUT_ENERGY.isApplicable(partBlock))
                     return 2;
 
-                if (PartAbility.OUTPUT_LASER.isApplicable(partBlock))
+                if (PartAbility.LASER_TRANSMISSION.isApplicable(partBlock))
                     return 3;
             }
 
@@ -154,8 +154,8 @@ public static TraceabilityPredicate getHatchPredicates() {
                 .or(abilities(PartAbility.OUTPUT_ENERGY).setPreviewCount(2))
                 .or(abilities(PartAbility.SUBSTATION_INPUT_ENERGY).setPreviewCount(1))
                 .or(abilities(PartAbility.SUBSTATION_OUTPUT_ENERGY).setPreviewCount(1))
-                .or(abilities(PartAbility.INPUT_LASER).setPreviewCount(1))
-                .or(abilities(PartAbility.OUTPUT_LASER).setPreviewCount(1));
+                .or(abilities(PartAbility.LASER_RECEPTION).setPreviewCount(1))
+                .or(abilities(PartAbility.LASER_TRANSMISSION).setPreviewCount(1));
     }
 
     @Override

diff --git a/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java b/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
@@ -24,7 +24,6 @@
 import com.gregtechceu.gtceu.common.commands.GTCommands;
 import com.gregtechceu.gtceu.common.commands.HazardCommands;
 import com.gregtechceu.gtceu.common.commands.MedicalConditionCommands;
-import com.gregtechceu.gtceu.common.data.GTBlocks;
 import com.gregtechceu.gtceu.common.data.GTBlockEntities;
 import com.gregtechceu.gtceu.common.data.GTBlocks;
 import com.gregtechceu.gtceu.common.data.GTItems;