various things

no sound for agony yet still
ice-nuclearcrackhead239 · Dec 10, 2024 · 0fd9713 · 0fd9713
1 parent e5c00c8
commit 0fd9713
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 7 deletions.
diff --git a/src/client/java/com/nuclearcrackhead/serverboss/registry/ModItemGroups.java b/src/client/java/com/nuclearcrackhead/serverboss/registry/ModItemGroups.java
@@ -1,11 +1,55 @@
 package com.nuclearcrackhead.serverboss.registry;
 
+import com.nuclearcrackhead.serverboss.SVBCR;
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
+import net.minecraft.item.ItemStack;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 public class ModItemGroups {
 
+    /*TODO:: add these groups:
+        DECORATED items
+        UNIQUE items
+        STRANGE items
+        GENUINE items
+        VINTAGE items
+        COMMUNITY items
+        COLLECTOR'S items
+        HAUNTED items
+        UNUSUAL items
+        CRACKED items
+        developer tools
+    */
+
+    public static final ItemGroup SVBCR_GROUP_FUNCBLOCKS = FabricItemGroup.builder()
+            .icon(() -> new ItemStack(ModBlocks.AGONY))
+            .displayName(Text.translatable("itemGroup.svbcr.functional_blocks"))
+            .entries((context, entries) -> {
+                entries.add(ModBlocks.AGONY);
+                entries.add(ModBlocks.SLUDGE);
+            })
+            .build();
+
+    public static final ItemGroup SVBCR_GROUP_DECOBLOCKS = FabricItemGroup.builder()
+            .icon(() -> new ItemStack(ModBlocks.EXAMPLE_BLOCK))
+            .displayName(Text.translatable("itemGroup.svbcr.decorational_blocks"))
+            .entries((context, entries) -> {
+                entries.add(ModBlocks.EXAMPLE_BLOCK);
+                entries.add(ModBlocks.WASTEBARREL);
+            })
+            .build();
+
+
     public static void init() {
+        Registry.register(Registries.ITEM_GROUP, Identifier.of(SVBCR.MOD_ID, "funcblocks"), SVBCR_GROUP_FUNCBLOCKS);
+        Registry.register(Registries.ITEM_GROUP, Identifier.of(SVBCR.MOD_ID, "decoblocks"), SVBCR_GROUP_DECOBLOCKS);
+
         ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> {
             entries.add(ModBlocks.EXAMPLE_BLOCK);
         });

diff --git a/src/main/java/com/nuclearcrackhead/serverboss/SVBCR.java b/src/main/java/com/nuclearcrackhead/serverboss/SVBCR.java
@@ -1,11 +1,7 @@
 package com.nuclearcrackhead.serverboss;
 
-import com.nuclearcrackhead.serverboss.registry.ModBlocks;
-import com.nuclearcrackhead.serverboss.registry.ModFluids;
-import com.nuclearcrackhead.serverboss.registry.ModItems;
-import com.nuclearcrackhead.serverboss.registry.ModDamageTypes;
+import com.nuclearcrackhead.serverboss.registry.*;
 import net.fabricmc.api.ModInitializer;
-
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,5 +21,7 @@ public void onInitialize() {
 		ModFluids.init();
 		ModBlocks.init();
 		ModDamageTypes.init();
+		ModSounds.init();
+		ExtraPacks.init();
 	}
 }
diff --git a/src/main/java/com/nuclearcrackhead/serverboss/content/block/Agony.java b/src/main/java/com/nuclearcrackhead/serverboss/content/block/Agony.java
@@ -9,9 +9,12 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.particle.DustParticleEffect;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ColorHelper;
 import net.minecraft.world.World;
 
 public class Agony extends Block {
@@ -32,10 +35,14 @@ public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity enti
             //                .get(RegistryKeys.DAMAGE_TYPE)
             //                .entryOf(ModDamageTypes.AGONY_DAMAGE));
             livingEntity.serverDamage(entity.getDamageSources().create(ModDamageTypes.AGONY_DAMAGE, null), livingEntity.getMaxHealth() / 7);
+            if (world instanceof ServerWorld serverWorld) {
+                serverWorld.spawnParticles(new DustParticleEffect(ColorHelper.fromFloats(1, 1, 0, 0), 2), livingEntity.getPos().getX(), livingEntity.getPos().getY(), livingEntity.getPos().getZ(), 4, 0.2, 0, 0.2, 0);
+            }
             if (!world.isClient) {
                 //todo find a better way to do this so that it doesnt run every single tick
                 //world.playSound(null, pos, ModSounds.BLOCK_AGONY_ACTIVATE_FANGSNAP, SoundCategory.BLOCKS);
                 //world.playSound(null, pos, ModSounds.BLOCK_AGONY_ACTIVATE_ZOMBIESTEP, SoundCategory.BLOCKS);
+
             }
         }
 

diff --git a/src/main/java/com/nuclearcrackhead/serverboss/content/block/Sludge.java b/src/main/java/com/nuclearcrackhead/serverboss/content/block/Sludge.java
@@ -26,7 +26,7 @@ public class Sludge extends TranslucentBlock {
     private static final double field_31103 = 0.05;
     private static final int TICKS_PER_SECOND = 20;
     protected static final VoxelShape SHAPE = Block.createCuboidShape((double)1.0F, (double)0.0F, (double)1.0F, (double)15.0F, (double)15.0F, (double)15.0F);
-    protected static final VoxelShape LINESHAPE = Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 15.0, 16.0);
+    protected static final VoxelShape LINESHAPE = Block.createCuboidShape(0.0, -1.0, 0.0, 16.0, 15.0, 16.0);
 
     public MapCodec<Sludge> getCodec() {
         return CODEC;

diff --git a/src/main/java/com/nuclearcrackhead/serverboss/registry/ExtraPacks.java b/src/main/java/com/nuclearcrackhead/serverboss/registry/ExtraPacks.java
@@ -0,0 +1,22 @@
+package com.nuclearcrackhead.serverboss.registry;
+
+import com.nuclearcrackhead.serverboss.SVBCR;
+import net.fabricmc.fabric.api.resource.*;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+
+import static com.nuclearcrackhead.serverboss.SVBCR.MOD_ID;
+
+public class ExtraPacks {
+
+    public static void init() {
+        ModContainer svbcr = FabricLoader.getInstance().getModContainer(SVBCR.MOD_ID)
+                .orElseThrow(() -> new IllegalStateException("hi where's the mod container"));
+        Identifier packId = Identifier.of(MOD_ID, "reworks");
+        Text packName = Text.literal("SVB:CR: Vanilla Reworks");
+        ResourceManagerHelper.registerBuiltinResourcePack(packId, svbcr, packName, ResourcePackActivationType.NORMAL);
+    }
+
+}
diff --git a/src/main/resources/assets/svbcr/lang/en_us.json b/src/main/resources/assets/svbcr/lang/en_us.json
@@ -11,5 +11,8 @@
   "item.svbcr.example_item": "Example Item",
   "item.svbcr.radioactive_bucket": "Radioactive Waste Barrel",
 
+  "itemGroup.svbcr.functional_blocks": "Serverboss Functional Blocks",
+  "itemGroup.svbcr.decorational_blocks": "Serverboss Decorational Blocks",
+
   "subtitles.block.agony.activate": "Agony"
 }
diff --git a/src/main/resources/assets/svbcr/models/block/sludge.json b/src/main/resources/assets/svbcr/models/block/sludge.json
@@ -6,6 +6,13 @@
     "up": "svbcr:block/sludge",
     "side": "svbcr:block/sludge_side"
   },
+  "display": {
+    "gui": {
+      "rotation": [30, 225, 0],
+      "translation": [0, 0.625, 0],
+      "scale": [0.625, 0.625, 0.625]
+    }
+  },
   "elements": [
     {
       "from": [

diff --git a/src/main/resources/resourcepacks/reworks/pack.mcmeta b/src/main/resources/resourcepacks/reworks/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "description": "Retextures of vanilla blocks to match SVB:CR",
+    "description": "Retextures of vanilla blocks",
     "pack_format": 48,
     "supported_formats": [
       0,