Merge pull request #870 from MCTian-mi/groovy-1.0.1

Update to CEu 2.8.8-beta and GroovyScript 1.0.1
SymmetricDevs · Jun 29, 2024 · 5e5b787 · 5e5b787
2 parents f893d1f + f0fdf2a
commit 5e5b787
Show file tree

Hide file tree

Showing 32 changed files with 1,243 additions and 1,237 deletions.
diff --git a/groovy/globals/CarbonGlobals.groovy b/groovy/globals/CarbonGlobals.groovy
@@ -1,3 +1,5 @@
+package globals
+
 import groovy.transform.TupleConstructor
 
 class CarbonGlobals {

diff --git a/groovy/globals/GroovyUtils.groovy b/groovy/globals/GroovyUtils.groovy
@@ -1,3 +1,5 @@
+package globals
+
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.integration.groovy.VirtualizedRecipeMap;
@@ -14,6 +16,4 @@ class GroovyUtils {
  return false
  }}).removeAll()
  }
-
-
 }
diff --git a/groovy/globals/SinteringGlobals.groovy b/groovy/globals/SinteringGlobals.groovy
@@ -1,3 +1,5 @@
+package globals
+
 class SinteringGlobals {
 
  public static void main (String[] args) {

diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
diff --git a/groovy/material/OreMaterials.groovy b/groovy/material/OreMaterials.groovy
diff --git a/groovy/material/OrganicChemistryMaterials.groovy b/groovy/material/OrganicChemistryMaterials.groovy
diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy
diff --git a/groovy/material/ThermodynamicsMaterials.groovy b/groovy/material/ThermodynamicsMaterials.groovy
@@ -27,22 +27,22 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("hot_hp_" + materialName.toString()))
  .gas(new FluidBuilder().temperature(323))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 1, SuSyUtility.susyId("hp_" + materialName.toString()))
  .gas()
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  if (generateCold) {
  new Material.Builder(id + 2, SuSyUtility.susyId("cold_hp_" + materialName.toString()))
  .gas(new FluidBuilder().temperature(223))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
  }
@@ -54,7 +54,7 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("liquid_" + materialName.toString()))
  .liquid(new FluidBuilder().temperature(boilingTemperature))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
  }
@@ -65,28 +65,28 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("hot_compressed_" + materialName.toString()))
  .gas(new FluidBuilder().temperature(323))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 1, SuSyUtility.susyId("compressed_" + materialName.toString()))
  .gas()
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 2, SuSyUtility.susyId("cold_compressed_" + materialName.toString()))
  .gas(new FluidBuilder().temperature(223))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 3, SuSyUtility.susyId("cold_" + materialName.toString()))
  .gas(new FluidBuilder().temperature(223))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
  }
@@ -97,7 +97,7 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("warm_" + materialName.toString()))
  .liquid(new FluidBuilder().temperature(303))
  .color(color)
- .components(materialName, 1)
+ .components(materialName)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
@@ -109,7 +109,7 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("hot_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 100))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
  }
@@ -120,56 +120,56 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("warm_dry_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 1, SuSyUtility.susyId("warm_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 2, SuSyUtility.susyId("warm_humid_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) + 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 3, SuSyUtility.susyId("dry_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material)))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 4, SuSyUtility.susyId("humid_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material)))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 5, SuSyUtility.susyId("cool_dry_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 6, SuSyUtility.susyId("cool_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
 
  new Material.Builder(id + 7, SuSyUtility.susyId("cool_humid_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material) - 20))
  .color(color)
- .components(material, 1)
+ .components(material)
  .flags(DISABLE_DECOMPOSITION)
  .build();
  }
@@ -180,7 +180,7 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("high_purity_" + material.toString()))
  .gas(new FluidBuilder().temperature(determineTemperatureGas(material)))
  .color(color)
- .components(material, 1)
+ .components(material)
  .build();
  }
 
@@ -190,7 +190,7 @@ class ThermodynamicsMaterials {
  new Material.Builder(id, SuSyUtility.susyId("high_purity_" + material.toString()))
  .liquid(new FluidBuilder().temperature(determineTemperatureLiquid(material)))
  .color(color)
- .components(material, 1)
+ .components(material)
  .build();
  }
 
@@ -478,7 +478,7 @@ class ThermodynamicsMaterials {
 
  SupercriticalCarbonDioxide = new Material.Builder(22843, SuSyUtility.susyId('supercritical_carbon_dioxide'))
  .liquid(new FluidBuilder().temperature(373))
- .components(CarbonDioxide, 1)
+ .components(CarbonDioxide)
  .colorAverage()
  .build();
  }