remove remnants of silver glow mechanic & update block texture

Author: PssbleTrngle

src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05

@@ -1,4 +1,4 @@
-// 1.20.1	2024-09-11T16:17:06.6440035	oreganized Block States
+// 1.20.1	2024-10-14T09:19:15.8831231	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
@@ -60,6 +60,7 @@ a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silve
 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json
 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json
 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json
+dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json
 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json
 870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json
 6992b8d448ed847ea9391428732a4f3aaddf258e assets/oreganized/blockstates/waxed_black_concrete_powder.json
@@ -536,6 +537,7 @@ d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_
 6056202082cd609584dd6fd4571c8e4b615988a5 assets/oreganized/models/block/red_hot_lead_trapdoor_open.json
 1974b68a782c0fcbe8b00eaf5c913341456bcfc3 assets/oreganized/models/block/red_hot_lead_trapdoor_top.json
 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json
+8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json
 e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json
 4afbdc94277d1af98491836904766a30c027965b assets/oreganized/models/block/spotted_glance.json
 d3acbbfbb7ca49fa57f8df95a92a67ed211fa6bd assets/oreganized/models/block/white_concrete_powder.json

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

@@ -1,4 +1,4 @@
-// 1.20.1	2024-10-11T21:00:01.0555679	oreganized Item Models
+// 1.20.1	2024-10-14T09:21:58.7369898	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
@@ -128,6 +128,7 @@ f7c411b709a3af883b55ceb15524a116468ee0b4 assets/oreganized/models/item/purple_cr
 4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json
 2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json
 0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json
+c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_block.json
 13ffab906a6704c68eb4fef73382a7b0e0a5d5be assets/oreganized/models/item/silver_ingot.json
 13ed84c2f215331446a11c803af482b22156e938 assets/oreganized/models/item/silver_nugget.json
 59197789f826ddb98e6b015bc21089a1e97612bc assets/oreganized/models/item/silver_ore.json

src/generated/resources/assets/oreganized/blockstates/silver_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "oreganized:block/silver_block"
+    }
+  }
+}

src/generated/resources/assets/oreganized/lang/en_us.json

@@ -165,4 +165,4 @@
   "trim_material.oreganized.lead": "Lead material",
   "trim_material.oreganized.silver": "Silver material",
   "upgrade.oreganized.electrum_upgrade": "Electrum Upgrade"
-}
+}

src/generated/resources/assets/oreganized/models/block/silver_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "oreganized:block/silver_block"
+  }
+}

src/generated/resources/assets/oreganized/models/item/silver_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "oreganized:block/silver_block"
+}

src/main/java/galena/oreganized/content/ISilver.java

@@ -1,6 +1,5 @@
 package galena.oreganized.content;
 
-import galena.oreganized.content.block.SilverBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
@@ -16,8 +15,8 @@ public interface ISilver {
 
     default List<Entity> getEntities(Level world, BlockPos pos, @Nullable Player player) {
         return world.getEntities((Entity) player,
-                new AABB(pos.getX() + SilverBlock.RANGE, pos.getY() + SilverBlock.RANGE, pos.getZ() + SilverBlock.RANGE,
-                        pos.getX() - SilverBlock.RANGE, pos.getY() - SilverBlock.RANGE, pos.getZ() - SilverBlock.RANGE),
+                new AABB(pos.getX() + RANGE, pos.getY() + RANGE, pos.getZ() + RANGE,
+                        pos.getX() - RANGE, pos.getY() - RANGE, pos.getZ() - RANGE),
                 (Entity living) -> living instanceof LivingEntity && ((LivingEntity) living).isInvertedHealAndHarm()
         );
     }
@@ -38,8 +37,8 @@ default int getUndeadDistance(Level world, BlockPos pos, @Nullable Player player
         for (Entity e : getEntities(world, pos, player)) {
             LivingEntity living = (LivingEntity) e;
             double distance = player != null ? living.distanceTo(player) : Math.sqrt(living.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()));
-            double ceil = Math.ceil(distance / (SilverBlock.RANGE / frames));
-            if (distance < SilverBlock.RANGE && ((int) ceil) < dist) {
+            double ceil = Math.ceil(distance / (RANGE / frames));
+            if (distance < RANGE && ((int) ceil) < dist) {
                 if (distance < 6) {
                     dist = 1;
                 } else dist = Math.max( (int) ceil, 2);

src/main/java/galena/oreganized/content/block/SilverBlock.java

@@ -40,6 +40,7 @@ protected void registerStatesAndModels() {
         simpleBlock(OBlocks.DEEPSLATE_LEAD_ORE);
         simpleBlock(OBlocks.RAW_SILVER_BLOCK);
         simpleBlock(OBlocks.RAW_LEAD_BLOCK);
+        simpleBlock(OBlocks.SILVER_BLOCK);
         meltableBlock(OBlocks.LEAD_BLOCK, (n, t) -> models().cubeAll(n, t));
         meltableBlock(OBlocks.LEAD_BRICKS, (n, t) -> models().cubeAll(n, t));
         meltablePillar(OBlocks.LEAD_PILLAR);

src/main/java/galena/oreganized/data/OBlockStates.java

@@ -77,6 +77,7 @@ protected void registerModels() {
         block(OBlocks.LEAD_ORE);
         block(OBlocks.DEEPSLATE_LEAD_ORE);
         block(OBlocks.RAW_SILVER_BLOCK);
+        block(OBlocks.SILVER_BLOCK);
         block(OBlocks.RAW_LEAD_BLOCK);
         block(OBlocks.LEAD_BLOCK);
         block(OBlocks.LEAD_BRICKS);

src/main/java/galena/oreganized/data/OItemModels.java

@@ -17,7 +17,6 @@
 import galena.oreganized.content.block.MoltenLeadBlock;
 import galena.oreganized.content.block.MoltenLeadCauldronBlock;
 import galena.oreganized.content.block.ShrapnelBombBlock;
-import galena.oreganized.content.block.SilverBlock;
 import galena.oreganized.content.block.SpottedGlanceBlock;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.BlockItem;
@@ -78,7 +77,7 @@ public class OBlocks {
     // Storage Blocks
     public static final RegistryObject<Block> RAW_SILVER_BLOCK = register("raw_silver_block", () -> new Block(BlockBehaviour.Properties.copy(Blocks.RAW_IRON_BLOCK)));
     public static final RegistryObject<Block> RAW_LEAD_BLOCK = register("raw_lead_block", () -> new LeadOreBlock(BlockBehaviour.Properties.copy(Blocks.RAW_IRON_BLOCK)));
-    public static final RegistryObject<Block> SILVER_BLOCK = register("silver_block", () -> new SilverBlock(BlockBehaviour.Properties.of()
+    public static final RegistryObject<Block> SILVER_BLOCK = register("silver_block", () -> new Block(BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)
             .strength(5.0F, 6.0F).sound(SoundType.METAL)));
 
     public static final RegistryObject<Block> GARGOYLE = register("gargoyle", () -> new GargoyleBlock(BlockBehaviour.Properties.copy(Blocks.STONE).noOcclusion()));