Freezer rework 2, 1.2.1.A version

Artienia80 · Artienia80 · commit e1d953937864 · 2024-11-22T13:00:07.000+01:00
diff --git a/common/src/main/java/net/artienia/rubinated_nether/RubinatedNether.java b/common/src/main/java/net/artienia/rubinated_nether/RubinatedNether.java
@@ -9,7 +9,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntityType;
+//import net.minecraft.world.level.block.entity.BlockEntityType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uwu.serenity.critter.RegistryManager;
@@ -47,13 +47,13 @@ public static void init() {
 
     public static void setup() {
         // Register freezing times
-        FreezerBlockEntity.addItemFreezingTime(Items.SNOWBALL, 50);
-        FreezerBlockEntity.addItemFreezingTime(Blocks.SNOW_BLOCK, 400);
-        FreezerBlockEntity.addItemFreezingTime(Blocks.FROSTED_ICE, 800);
-        FreezerBlockEntity.addItemFreezingTime(Blocks.ICE, 1600);
-        FreezerBlockEntity.addItemFreezingTime(Blocks.PACKED_ICE, 3200);
-        FreezerBlockEntity.addItemFreezingTime(Blocks.BLUE_ICE, 6400);
-        FreezerBlockEntity.addItemFreezingTime(RNBlocks.DRY_ICE, 12800);
+        FreezerBlockEntity.addItemFreezingTime(Items.SNOWBALL, 25);
+        FreezerBlockEntity.addItemFreezingTime(Blocks.SNOW_BLOCK, 150);
+        FreezerBlockEntity.addItemFreezingTime(Blocks.FROSTED_ICE, 300);
+        FreezerBlockEntity.addItemFreezingTime(Blocks.ICE, 600);
+        FreezerBlockEntity.addItemFreezingTime(Blocks.PACKED_ICE, 1200);
+        FreezerBlockEntity.addItemFreezingTime(Blocks.BLUE_ICE, 2400);
+        FreezerBlockEntity.addItemFreezingTime(RNBlocks.DRY_ICE, 4800);
 
         // Mod compat setup
         RNModCompat.setup();
diff --git a/common/src/main/java/net/artienia/rubinated_nether/integrations/aether/AetherCompat.java b/common/src/main/java/net/artienia/rubinated_nether/integrations/aether/AetherCompat.java
@@ -13,6 +13,6 @@ public void init() {}
     @Override
     public void setup() {
         Block icestone = BuiltInRegistries.BLOCK.get(new ResourceLocation("aether", "icestone"));
-        FreezerBlockEntity.addItemFreezingTime(icestone, 1200);
+        FreezerBlockEntity.addItemFreezingTime(icestone, 600);
     }
 }
diff --git a/common/src/main/java/net/artienia/rubinated_nether/integrations/netherexp/JNECompat.java b/common/src/main/java/net/artienia/rubinated_nether/integrations/netherexp/JNECompat.java
@@ -14,9 +14,9 @@ public void init() {}
     @Override
     public void setup() {
         Block black_ice = BuiltInRegistries.BLOCK.get(new ResourceLocation("netherexp", "black_ice"));
-        FreezerBlockEntity.addItemFreezingTime(black_ice, 3200);
+        FreezerBlockEntity.addItemFreezingTime(black_ice, 1200);
 
         Item ectoplasm_bucket = BuiltInRegistries.ITEM.get(new ResourceLocation("netherexp", "ectoplasm_bucket"));
-        FreezerBlockEntity.addItemFreezingTime(ectoplasm_bucket, 20000);
+        FreezerBlockEntity.addItemFreezingTime(ectoplasm_bucket, 19200);
     }
 }
diff --git a/common/src/main/resources/assets/rubinated_nether/textures/block/dry_ice.png b/common/src/main/resources/assets/rubinated_nether/textures/block/dry_ice.png
diff --git a/common/src/main/resources/data/rubinated_nether/advancements/recipes/misc/frosted_ice_from_water_bucket.json b/common/src/main/resources/data/rubinated_nether/advancements/recipes/misc/frosted_ice_from_water_bucket.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_water": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:water_bucket"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "rubinated_nether:frosted_ice_from_water_bucket"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_water"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "rubinated_nether:frosted_ice_from_water_bucket"
+    ]
+  }
+}
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/blue_ice_from_packed_ice.json b/common/src/main/resources/data/rubinated_nether/recipes/blue_ice_from_packed_ice.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 3200,
+  "cookingtime": 9600,
   "experience": 1.0,
   "ingredient": {
     "item": "minecraft:packed_ice"
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/dry_ice_from_blue_ice.json b/common/src/main/resources/data/rubinated_nether/recipes/dry_ice_from_blue_ice.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 6400,
+  "cookingtime": 19200,
   "experience": 1.0,
   "ingredient": {
     "item": "minecraft:blue_ice"
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/frosted_ice_from_snow_block.json b/common/src/main/resources/data/rubinated_nether/recipes/frosted_ice_from_snow_block.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 400,
+  "cookingtime": 1200,
   "experience": 1.0,
   "ingredient": {
     "item": "minecraft:snow_block"
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/frosted_ice_from_water_bucket.json b/common/src/main/resources/data/rubinated_nether/recipes/frosted_ice_from_water_bucket.json
@@ -1,10 +1,10 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 800,
+  "cookingtime": 4800,
   "experience": 1.0,
   "ingredient": {
     "item": "minecraft:water_bucket"
   },
-  "result": "minecraft:ice"
+  "result": "rubinated_nether:frosted_ice"
 }
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/ice_from_frosted_ice.json b/common/src/main/resources/data/rubinated_nether/recipes/ice_from_frosted_ice.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 400,
+  "cookingtime": 2400,
   "experience": 1.0,
   "ingredient": {
     "item": "rubinated_nether:frosted_ice"
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/netherexp/black_ice_from_ecto_soul_sand.json b/common/src/main/resources/data/rubinated_nether/recipes/netherexp/black_ice_from_ecto_soul_sand.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 400,
+  "cookingtime": 1200,
   "experience": 1.0,
   "ingredient": {
     "item": "netherexp:ecto_soul_sand"
diff --git a/common/src/main/resources/data/rubinated_nether/recipes/packed_ice_from_ice.json b/common/src/main/resources/data/rubinated_nether/recipes/packed_ice_from_ice.json
@@ -1,7 +1,7 @@
 {
   "type": "rubinated_nether:freezing",
   "category": "freezable_misc",
-  "cookingtime": 1600,
+  "cookingtime": 4800,
   "experience": 1.0,
   "ingredient": {
     "item": "minecraft:ice"
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # Mod properties
 mod_id=rubinated_nether
-mod_version=1.2.0a-1.20.1
+mod_version=1.2.1.A-1.20.1
 mod_license=Code: LGPL-3.0; Assets: CC BY-SA 4.0
 mod_group_id=net.artienia.rubinated_nether
 mod_authors=Artienia, Juniper, Darksonic300, Serine

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public void init() {}`
`13`	`13`	`@Override`
`14`	`14`	`public void setup() {`
`15`	`15`	`Block icestone = BuiltInRegistries.BLOCK.get(new ResourceLocation("aether", "icestone"));`
`16`		`- FreezerBlockEntity.addItemFreezingTime(icestone, 1200);`
	`16`	`+ FreezerBlockEntity.addItemFreezingTime(icestone, 600);`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ public void init() {}`
`14`	`14`	`@Override`
`15`	`15`	`public void setup() {`
`16`	`16`	`Block black_ice = BuiltInRegistries.BLOCK.get(new ResourceLocation("netherexp", "black_ice"));`
`17`		`- FreezerBlockEntity.addItemFreezingTime(black_ice, 3200);`
	`17`	`+ FreezerBlockEntity.addItemFreezingTime(black_ice, 1200);`
`18`	`18`
`19`	`19`	`Item ectoplasm_bucket = BuiltInRegistries.ITEM.get(new ResourceLocation("netherexp", "ectoplasm_bucket"));`
`20`		`- FreezerBlockEntity.addItemFreezingTime(ectoplasm_bucket, 20000);`
	`20`	`+ FreezerBlockEntity.addItemFreezingTime(ectoplasm_bucket, 19200);`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "rubinated_nether:freezing",`
`3`	`3`	`"category": "freezable_misc",`
`4`		`- "cookingtime": 3200,`
	`4`	`+ "cookingtime": 9600,`
`5`	`5`	`"experience": 1.0,`
`6`	`6`	`"ingredient": {`
`7`	`7`	`"item": "minecraft:packed_ice"`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"type": "rubinated_nether:freezing",`
`3`	`3`	`"category": "freezable_misc",`
`4`		`- "cookingtime": 800,`
	`4`	`+ "cookingtime": 4800,`
`5`	`5`	`"experience": 1.0,`
`6`	`6`	`"ingredient": {`
`7`	`7`	`"item": "minecraft:water_bucket"`
`8`	`8`	`},`
`9`		`- "result": "minecraft:ice"`
	`9`	`+ "result": "rubinated_nether:frosted_ice"`
`10`	`10`	`}`