From 4ffe86727f29194decb9a29f6fe375f2e8d086f8 Mon Sep 17 00:00:00 2001 From: gatoborrachon <61126174+gatoborrachon@users.noreply.github.com> Date: Sun, 25 Oct 2020 20:13:46 -0600 Subject: [PATCH 1/3] fixed something related to coolant cells 1.- a recipe error (the 360k coolant cell) 2.- the durability of the coolant cells (instead of being "10000" for everyone, now its "60000", "180000" and "360000" respectively) --- src/main/java/frogcraftrebirth/common/FrogRegistries.java | 6 +++--- .../frogcraftrebirth/common/item/ItemAmmoniaCoolant.java | 2 +- .../frogcraftrebirth/recipes/ammonia_coolant_360k.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/frogcraftrebirth/common/FrogRegistries.java b/src/main/java/frogcraftrebirth/common/FrogRegistries.java index a393887..f8d4bb0 100644 --- a/src/main/java/frogcraftrebirth/common/FrogRegistries.java +++ b/src/main/java/frogcraftrebirth/common/FrogRegistries.java @@ -148,9 +148,9 @@ public static void regItem(RegistryEvent.Register event) { new ItemFrogBlock(FrogGameObjects.CONDENSE_TOWER_CYLINDER).setRegistryName("condense_tower_cylinder"), new ItemFrogBlock(FrogGameObjects.CONDENSE_TOWER_OUTLET).setRegistryName("condense_tower_outlet"), new ItemMPS((BlockMPS) FrogGameObjects.MPS).setRegistryName("mobile_power_station"), - new ItemAmmoniaCoolant("60k", 6000).setRegistryName("ammonia_coolant_60k"), - new ItemAmmoniaCoolant("180k", 18000).setRegistryName("ammonia_coolant_180k"), - new ItemAmmoniaCoolant("360k", 36000).setRegistryName("ammonia_coolant_360k"), + new ItemAmmoniaCoolant("60k", 60000).setRegistryName("ammonia_coolant_60k"), + new ItemAmmoniaCoolant("180k", 180000).setRegistryName("ammonia_coolant_180k"), + new ItemAmmoniaCoolant("360k", 360000).setRegistryName("ammonia_coolant_360k"), new ItemDecayBattery().setTranslationKey("uranium_decay_battery").setRegistryName("uranium_decay_battery"), new ItemDecayBattery().setTranslationKey("thorium_decay_battery").setRegistryName("thorium_decay_battery"), new ItemDecayBattery().setTranslationKey("plutonium_decay_battery").setRegistryName("plutonium_decay_battery"), diff --git a/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java b/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java index 968855a..acc7310 100644 --- a/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java +++ b/src/main/java/frogcraftrebirth/common/item/ItemAmmoniaCoolant.java @@ -35,7 +35,7 @@ public ItemAmmoniaCoolant(String type, int storage) { super(); this.heatStorage = storage; this.setTranslationKey("frogcraftrebirth.ammonia_coolant." + type); - this.setMaxDamage(10000); + this.setMaxDamage(storage); } @Override diff --git a/src/main/resources/assets/frogcraftrebirth/recipes/ammonia_coolant_360k.json b/src/main/resources/assets/frogcraftrebirth/recipes/ammonia_coolant_360k.json index 18aa466..adff051 100644 --- a/src/main/resources/assets/frogcraftrebirth/recipes/ammonia_coolant_360k.json +++ b/src/main/resources/assets/frogcraftrebirth/recipes/ammonia_coolant_360k.json @@ -5,7 +5,7 @@ } ], "result": { - "item": "frogcraftrebirth:ammonia_coolant_180k", + "item": "frogcraftrebirth:ammonia_coolant_360k", "data": 0 }, "group": "frogcraftrebirth:coolant", From a8d9d87994f7605b93bfce337d8d1b88d4a16705 Mon Sep 17 00:00:00 2001 From: gatoborrachon <61126174+gatoborrachon@users.noreply.github.com> Date: Fri, 3 Sep 2021 00:22:33 -0500 Subject: [PATCH 2/3] Fix for wrong output in macerator for crushed ores Due to the preemptive flattening, there was left this small error --- src/main/java/frogcraftrebirth/common/FrogRecipes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/frogcraftrebirth/common/FrogRecipes.java b/src/main/java/frogcraftrebirth/common/FrogRecipes.java index 2061aca..54b3652 100644 --- a/src/main/java/frogcraftrebirth/common/FrogRecipes.java +++ b/src/main/java/frogcraftrebirth/common/FrogRecipes.java @@ -154,9 +154,9 @@ public static void postInit() { Recipes.advRecipes.addRecipe(new ItemStack(FrogGameObjects.AMMONIA_COOLANT_60K), " T ", "TCT", " T ", 'T', "plateTin", 'C', FluidRegistry.getFluidStack("ammonia", 1000)); Recipes.advRecipes.addRecipe(new ItemStack(FrogGameObjects.JINKELA), "KKK", "PPP", "NNN", 'K', new ItemStack(FrogGameObjects.POTASSIUM), 'P', new ItemStack(FrogGameObjects.PHOSPHORUS), 'N', FluidRegistry.getFluidStack("nitrogen", 1000)); - Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.CARNALLITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_CARNALLITE_ORE, 3, 0)); - Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.DEWALQUITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_DEWALQUITE_ORE, 3, 1)); - Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.FLUORAPATITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_FLUORAPATITE_ORE, 3, 2)); + Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.CARNALLITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_CARNALLITE_ORE, 3)); + Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.DEWALQUITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_DEWALQUITE_ORE, 3)); + Recipes.macerator.addRecipe(Recipes.inputFactory.forStack(new ItemStack(FrogGameObjects.FLUORAPATITE)), null, false, new ItemStack(FrogGameObjects.CRUSHED_FLUORAPATITE_ORE, 3)); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotAluminium"), null, false, new ItemStack(FrogGameObjects.ALUMINIUM_DUST)); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotMagnalium"), null, false, new ItemStack(FrogGameObjects.MAGNALIUM_DUST)); Recipes.macerator.addRecipe(Recipes.inputFactory.forOreDict("ingotTitanium"), null, false, new ItemStack(FrogGameObjects.TITANIUM_DUST)); From 8c11ddcfa22c7346b7ecd6b4b72eb60b77c9c65d Mon Sep 17 00:00:00 2001 From: gatoborrachon <61126174+gatoborrachon@users.noreply.github.com> Date: Fri, 3 Sep 2021 00:36:59 -0500 Subject: [PATCH 3/3] Fix for missing lang --- src/main/resources/assets/frogcraftrebirth/lang/en_us.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/frogcraftrebirth/lang/en_us.lang b/src/main/resources/assets/frogcraftrebirth/lang/en_us.lang index 1344106..72739f7 100755 --- a/src/main/resources/assets/frogcraftrebirth/lang/en_us.lang +++ b/src/main/resources/assets/frogcraftrebirth/lang/en_us.lang @@ -167,6 +167,8 @@ fluid.carbon_dioxide=Carbon Dioxide fluid.carbon_dioxide.info=CO₂ fluid.carbon_oxide=Carbon Monoxide fluid.carbon_oxide.info=CO +fluid.chlorine=Chlorine +fluid.chlorine.info=Cl fluid.coal_tar=Coal Tar fluid.coal_tar.info=What the hell does it contain?! fluid.fluorine=Fluorine