Merge branch 'master' into migrate-casing

GTNewHorizons · Jan 3, 2025 · e904c25 · e904c25
2 parents 432452d + eb7ca29
commit e904c25
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java b/src/main/java/com/dreammaster/amazingtrophies/AchievementHandler.java
@@ -27,7 +27,7 @@
 public class AchievementHandler {
 
     private static final Map<UUID, Integer> LAST_DEATHCOUNT = new HashMap<>();
-    private static final HashMap<UUID, Float> LAST_DAMAGE = new HashMap<>();
+    private static final Map<UUID, Float> LAST_DAMAGE = new HashMap<>();
 
     private static StatBase infinityArmorAchievement;
     private static StatBase omegaArmorAchievement;

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -781,14 +781,6 @@ public void run() {
                                 .getToolWithStats(170, 1, Materials.WroughtIron, Materials.Steel, null))
                 .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
 
-        GTValues.RA.stdBuilder()
-                .itemInputs(
-                        GTOreDictUnificator.get(OrePrefixes.turbineBlade, Materials.Bronze, 4L),
-                        GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 1L))
-                .itemOutputs(
-                        MetaGeneratedTool01.INSTANCE.getToolWithStats(170, 1, Materials.Bronze, Materials.Steel, null))
-                .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
-
         GTValues.RA.stdBuilder()
                 .itemInputs(
                         GTOreDictUnificator.get(OrePrefixes.turbineBlade, Materials.Steel, 4L),

diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java
@@ -275,7 +275,7 @@ public void loadRecipes() {
                 .itemInputs(
                         BlockList.NeutroniumPlatedReinforcedStone.getIS(),
                         WerkstoffLoader.HDCS.get(OrePrefixes.plate, 8))
-                .itemOutputs(new ItemStack(IGItems.DysonSwarmItems, 1, 9))
+                .itemOutputs(getIGItem("dysonswarmparts", 1, 9))
                 .fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144)).duration(25 * SECONDS)
                 .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes);
         GTValues.RA.stdBuilder()