add grooved ice

PssbleTrngle · PssbleTrngle · commit 598dbb12bbb8 · 2024-09-10T14:53:25.000+02:00
diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05
@@ -1,4 +1,4 @@
-// 1.20.1	2024-07-22T22:02:00.7111198	oreganized Block States
+// 1.20.1	2024-09-10T14:28:17.9625293	oreganized Block States
 d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json
 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json
 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json
@@ -25,6 +25,9 @@ d9cf1c07d030b2f6303c81035e0037cb0c7c660e assets/oreganized/blockstates/glance_wa
 c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crystal_glass_pane.json
 8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json
 0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json
+381580fe541332a18ae1a9efa69fb53201b66140 assets/oreganized/blockstates/grooved_blue_ice.json
+cd524e91f5482d84fea6e9352cdffb3d3ad1ec23 assets/oreganized/blockstates/grooved_ice.json
+fcaefc29cf8c2a1dc8707623a2148406e2df6df3 assets/oreganized/blockstates/grooved_packed_ice.json
 c9995beec5545d6c6c41d8323c65ae06bbea0cbe assets/oreganized/blockstates/lead_bars.json
 121e6d2788d907261435fceb5c2ed9aec2947965 assets/oreganized/blockstates/lead_block.json
 d43efacf05b2229ee7dad465c3ad83df616ab763 assets/oreganized/blockstates/lead_bolt_crate.json
@@ -276,6 +279,9 @@ f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_cr
 5dea33a075a76c327a95d404e83859280d1678ad assets/oreganized/models/block/green_crystal_glass_pane_side_out.json
 526a594c52b1fd25b57124861bb247fd4fc32814 assets/oreganized/models/block/green_crystal_glass_pane_side_rot.json
 0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json
+6ac43f4b7a86ba2b1a3638637108659d12dfb006 assets/oreganized/models/block/grooved_blue_ice.json
+ff530b321353ded30d649ead0668faa2bcfe16a9 assets/oreganized/models/block/grooved_ice.json
+2a0395c97d8caca1311c8b5181b324c228af84d7 assets/oreganized/models/block/grooved_packed_ice.json
 cb3cc16c959785c50d6228a4ae538019643d4954 assets/oreganized/models/block/lead_bars_cap.json
 be4d3f74e1f26b375a898571e38750510f450038 assets/oreganized/models/block/lead_bars_cap_alt.json
 d2e7a7bcc18d80e85ad8d72e84ab19a631e321d0 assets/oreganized/models/block/lead_bars_post.json
diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5
@@ -1,4 +1,4 @@
-// 1.20.1	2024-08-28T12:35:31.5287616	oreganized Item Models
+// 1.20.1	2024-09-10T14:28:17.9851553	oreganized Item Models
 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -83,6 +83,9 @@ bbe691c708914b9faf9bade0d70192b5fe4eaebb assets/oreganized/models/item/glance_st
 620d7f2b29b528e35dc4bd1ba7caf47fea81e005 assets/oreganized/models/item/gray_crystal_glass_pane.json
 be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_crystal_glass.json
 0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json
+980a1d284d8ad09fb8a3cd3f6de11a5150e48a60 assets/oreganized/models/item/grooved_blue_ice.json
+0a9bb963b90f719437cc2208e8a61ac1ea12d07d assets/oreganized/models/item/grooved_ice.json
+0253c31f06cd51dcace95b3f958e2fa2e98bc954 assets/oreganized/models/item/grooved_packed_ice.json
 55b5268d1200536fb742606ae34dd2a149e6d5be assets/oreganized/models/item/lead_bars.json
 41e56017441ac21af8e8b9bb05b61e1cf4fbd035 assets/oreganized/models/item/lead_block.json
 ae57922ed2f7a86f2f2228c54fe277a743a93000 assets/oreganized/models/item/lead_bolt.json
diff --git a/src/generated/resources/assets/oreganized/blockstates/grooved_blue_ice.json b/src/generated/resources/assets/oreganized/blockstates/grooved_blue_ice.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oreganized:block/grooved_blue_ice"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/blockstates/grooved_ice.json b/src/generated/resources/assets/oreganized/blockstates/grooved_ice.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oreganized:block/grooved_ice"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/blockstates/grooved_packed_ice.json b/src/generated/resources/assets/oreganized/blockstates/grooved_packed_ice.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oreganized:block/grooved_packed_ice"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json
@@ -37,6 +37,9 @@
   "block.oreganized.gray_crystal_glass_pane": "Gray Crystal Glass Pane",
   "block.oreganized.green_crystal_glass": "Green Crystal Glass",
   "block.oreganized.green_crystal_glass_pane": "Green Crystal Glass Pane",
+  "block.oreganized.grooved_blue_ice": "Grooved Blue Ice",
+  "block.oreganized.grooved_ice": "Grooved Ice",
+  "block.oreganized.grooved_packed_ice": "Grooved Packed Ice",
   "block.oreganized.lead_bars": "Lead Bars",
   "block.oreganized.lead_block": "Block of Lead",
   "block.oreganized.lead_bolt_crate": "Crate of Lead Bolts",
diff --git a/src/generated/resources/assets/oreganized/models/block/grooved_blue_ice.json b/src/generated/resources/assets/oreganized/models/block/grooved_blue_ice.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "oreganized:block/grooved_blue_ice"
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/models/block/grooved_ice.json b/src/generated/resources/assets/oreganized/models/block/grooved_ice.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "oreganized:block/grooved_ice"
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/models/block/grooved_packed_ice.json b/src/generated/resources/assets/oreganized/models/block/grooved_packed_ice.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "oreganized:block/grooved_packed_ice"
+  }
+}
diff --git a/src/generated/resources/assets/oreganized/models/item/grooved_blue_ice.json b/src/generated/resources/assets/oreganized/models/item/grooved_blue_ice.json
@@ -0,0 +1,3 @@
+{
+  "parent": "oreganized:block/grooved_blue_ice"
+}
diff --git a/src/generated/resources/assets/oreganized/models/item/grooved_ice.json b/src/generated/resources/assets/oreganized/models/item/grooved_ice.json
@@ -0,0 +1,3 @@
+{
+  "parent": "oreganized:block/grooved_ice"
+}
diff --git a/src/generated/resources/assets/oreganized/models/item/grooved_packed_ice.json b/src/generated/resources/assets/oreganized/models/item/grooved_packed_ice.json
@@ -0,0 +1,3 @@
+{
+  "parent": "oreganized:block/grooved_packed_ice"
+}
diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_blue_ice.json b/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_blue_ice.json
@@ -0,0 +1,31 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "oreganized:grooved_blue_ice"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "oreganized:blocks/grooved_blue_ice"
+}
diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_ice.json b/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_ice.json
@@ -0,0 +1,31 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "oreganized:grooved_ice"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "oreganized:blocks/grooved_ice"
+}
diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_packed_ice.json b/src/generated/resources/data/oreganized/loot_tables/blocks/grooved_packed_ice.json
@@ -0,0 +1,31 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:match_tool",
+          "predicate": {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:silk_touch",
+                "levels": {
+                  "min": 1
+                }
+              }
+            ]
+          }
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "oreganized:grooved_packed_ice"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "oreganized:blocks/grooved_packed_ice"
+}
diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java
@@ -349,6 +349,9 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event
             putAfter(entries, OBlocks.SILVER_ORE.get(), OBlocks.DEEPSLATE_SILVER_ORE);
             putAfter(entries, Items.RAW_COPPER_BLOCK, OBlocks.RAW_LEAD_BLOCK);
             putAfter(entries, Items.RAW_GOLD_BLOCK, OBlocks.RAW_SILVER_BLOCK);
+            putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE);
+            putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE);
+            putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE);
         }
         if (tab == CreativeModeTabs.REDSTONE_BLOCKS) {
             putBefore(entries, Items.NOTE_BLOCK, OBlocks.GARGOYLE);
diff --git a/src/main/java/galena/oreganized/content/entity/LeadBoltEntity.java b/src/main/java/galena/oreganized/content/entity/LeadBoltEntity.java
@@ -82,7 +82,7 @@ private void damageEntity(EntityHitResult result) {
                     serverLevel.sendParticles(ParticleTypes.POOF, vec.x, vec.y + 2, vec.z, 4, 0.1, 0.1, 0.1, 0.0);
                 }
 
-                playSound(OSoundEvents.BOLT_HIT_ARMOR.get(), 1.0F, 1.2F / (random.nextFloat() * 0.2F + 0.9F));
+                playSound(OSoundEvents.BOLT_HIT_ARMOR.get(), 1.5F, 1.2F / (random.nextFloat() * 0.2F + 0.9F));
                 if (knockedOff.getItem() instanceof Equipable item) {
                     playSound(item.getEquipSound());
                 }
diff --git a/src/main/java/galena/oreganized/content/item/ScribeItem.java b/src/main/java/galena/oreganized/content/item/ScribeItem.java
@@ -1,6 +1,7 @@
 package galena.oreganized.content.item;
 
 import galena.oreganized.content.block.ICrystalGlass;
+import galena.oreganized.index.OBlocks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.particles.BlockParticleOption;
 import net.minecraft.core.particles.ParticleTypes;
@@ -15,15 +16,33 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.Vec3;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
 import static galena.oreganized.index.OTags.Blocks.MINEABLE_WITH_SCRIBE;
 import static galena.oreganized.index.OTags.Blocks.SILKTOUCH_WITH_SCRIBE;
 
 public class ScribeItem extends Item {
 
+    private static final Map<Block, Supplier<Block>> GROOVED_BLOCKS = new HashMap<>();
+
+    public static void registerGroovedBlock(Block from, Supplier<Block> to) {
+        GROOVED_BLOCKS.put(from, to);
+    }
+
+    static {
+        registerGroovedBlock(Blocks.ICE, OBlocks.GROOVED_ICE);
+        registerGroovedBlock(Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE);
+        registerGroovedBlock(Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE);
+    }
+
     public ScribeItem(Properties properties) {
         super(properties);
     }
@@ -65,31 +84,41 @@ public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantmen
         return super.canApplyAtEnchantingTable(stack, enchantment);
     }
 
-    @Override
-    public InteractionResult useOn(UseOnContext context) {
-        var pos = context.getClickedPos();
+    private InteractionResult replaceBlock(UseOnContext context, BlockState to) {
         var level = context.getLevel();
-        var state = level.getBlockState(pos);
+        var pos = context.getClickedPos();
+        var from = level.getBlockState(pos);
 
-        if (state.hasProperty(ICrystalGlass.TYPE)) {
-            var type = state.getValue(ICrystalGlass.TYPE);
+        level.setBlockAndUpdate(pos, to);
+        level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(context.getPlayer(), from));
+        level.addDestroyBlockEffect(pos, from);
+
+        var vec = Vec3.atCenterOf(pos);
+        level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, from), vec.x, vec.y + 1, vec.z, 0.0, 0.0, 0.0);
 
-            level.setBlockAndUpdate(pos, state.setValue(ICrystalGlass.TYPE, (type + 1) % (ICrystalGlass.MAX_TYPE + 1)));
-            level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(context.getPlayer(), state));
-            level.addDestroyBlockEffect(pos, state);
+        if (context.getPlayer() != null) {
+            context.getPlayer().playSound(SoundEvents.GRINDSTONE_USE, 1F, 1.5F);
 
-            var vec = Vec3.atCenterOf(pos);
-            level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, state), vec.x, vec.y + 1, vec.z, 0.0, 0.0, 0.0);
+            context.getItemInHand().hurtAndBreak(1, context.getPlayer(), player -> {
+                player.broadcastBreakEvent(context.getHand());
+            });
+        }
 
-            if (context.getPlayer() != null) {
-                context.getPlayer().playSound(SoundEvents.GRINDSTONE_USE, 1F, 1.5F);
+        return InteractionResult.sidedSuccess(level.isClientSide);
+    }
 
-                context.getItemInHand().hurtAndBreak(1, context.getPlayer(), player -> {
-                    player.broadcastBreakEvent(context.getHand());
-                });
-            }
+    @Override
+    public InteractionResult useOn(UseOnContext context) {
+        var state = context.getLevel().getBlockState(context.getClickedPos());
+
+        if (state.hasProperty(ICrystalGlass.TYPE)) {
+            var type = state.getValue(ICrystalGlass.TYPE);
+            return replaceBlock(context, state.setValue(ICrystalGlass.TYPE, (type + 1) % (ICrystalGlass.MAX_TYPE + 1)));
+        }
 
-            return InteractionResult.sidedSuccess(level.isClientSide);
+        var grooved = GROOVED_BLOCKS.get(state.getBlock());
+        if (grooved != null) {
+            return replaceBlock(context, grooved.get().defaultBlockState());
         }
 
         return super.useOn(context);
diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java
@@ -107,6 +107,10 @@ protected void registerStatesAndModels() {
         crystalGlassBlock(OBlocks.BLACK_CRYSTAL_GLASS);
         crystalGlassPaneBlock(OBlocks.BLACK_CRYSTAL_GLASS_PANE, OBlocks.BLACK_CRYSTAL_GLASS);
 
+        simpleBlock(OBlocks.GROOVED_ICE);
+        simpleBlock(OBlocks.GROOVED_PACKED_ICE);
+        simpleBlock(OBlocks.GROOVED_BLUE_ICE);
+
         gargoyleBlock(OBlocks.GARGOYLE);
     }
 
diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java
@@ -124,6 +124,10 @@ protected void registerModels() {
         block(OBlocks.BLACK_CRYSTAL_GLASS);
         blockFlat(OBlocks.BLACK_CRYSTAL_GLASS_PANE, OBlocks.BLACK_CRYSTAL_GLASS);
 
+        block(OBlocks.GROOVED_ICE);
+        block(OBlocks.GROOVED_PACKED_ICE);
+        block(OBlocks.GROOVED_BLUE_ICE);
+
         for (Supplier<? extends Block> blocks : OBlocks.WAXED_CONRETE_POWDER) {
             withExistingParent(blockName(blocks), "minecraft:block/" + blockName(blocks).replace("waxed_", ""));
         }
diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java
@@ -83,6 +83,10 @@ protected void generate() {
             dropSelf(OBlocks.SHRAPNEL_BOMB);
             dropSelf(OBlocks.LEAD_BOLT_CRATE);
 
+            dropAsSilk(OBlocks.GROOVED_ICE);
+            dropAsSilk(OBlocks.GROOVED_PACKED_ICE);
+            dropAsSilk(OBlocks.GROOVED_BLUE_ICE);
+
             add(OBlocks.LEAD_DOOR.get(), LootTable.lootTable()
                     .withPool(applyExplosionCondition(OBlocks.LEAD_DOOR.get(), LootPool.lootPool()
                             .setRolls(ConstantValue.exactly(1.0F))
diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java
@@ -135,6 +135,10 @@ private static BlockBehaviour.Properties leadDecoProperties() {
     public static final RegistryObject<Block> RED_CRYSTAL_GLASS = register("red_crystal_glass", () -> new CrystalGlassBlock(DyeColor.RED, BlockBehaviour.Properties.copy(Blocks.RED_STAINED_GLASS)));
     public static final RegistryObject<Block> BLACK_CRYSTAL_GLASS = register("black_crystal_glass", () -> new CrystalGlassBlock(DyeColor.BLACK, BlockBehaviour.Properties.copy(Blocks.BLACK_STAINED_GLASS)));
 
+    public static final RegistryObject<Block> GROOVED_ICE = register("grooved_ice", () -> new Block(BlockBehaviour.Properties.copy(Blocks.ICE).friction(0.6F)));
+    public static final RegistryObject<Block> GROOVED_PACKED_ICE = register("grooved_packed_ice", () -> new Block(BlockBehaviour.Properties.copy(Blocks.PACKED_ICE).friction(0.6F)));
+    public static final RegistryObject<Block> GROOVED_BLUE_ICE = register("grooved_blue_ice", () -> new Block(BlockBehaviour.Properties.copy(Blocks.BLUE_ICE).friction(0.6F)));
+
     public static final List<RegistryObject<Block>> CRYSTAL_GLASS = List.of(
             WHITE_CRYSTAL_GLASS, ORANGE_CRYSTAL_GLASS, MAGENTA_CRYSTAL_GLASS, LIGHT_BLUE_CRYSTAL_GLASS,
             YELLOW_CRYSTAL_GLASS, LIME_CRYSTAL_GLASS, PINK_CRYSTAL_GLASS, GRAY_CRYSTAL_GLASS, LIGHT_GRAY_CRYSTAL_GLASS,
diff --git a/src/main/resources/assets/oreganized/textures/block/grooved_blue_ice.png b/src/main/resources/assets/oreganized/textures/block/grooved_blue_ice.png
diff --git a/src/main/resources/assets/oreganized/textures/block/grooved_ice.png b/src/main/resources/assets/oreganized/textures/block/grooved_ice.png
diff --git a/src/main/resources/assets/oreganized/textures/block/grooved_packed_ice.png b/src/main/resources/assets/oreganized/textures/block/grooved_packed_ice.png

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "oreganized:block/grooved_blue_ice"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "oreganized:block/grooved_blue_ice"`
	`3`	`+}`