fix: fixes

Zepalesque · May 25, 2024 · c308005 · c308005
1 parent 6a4d876
commit c308005
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/main/java/net/zepalesque/redux/Redux.java b/src/main/java/net/zepalesque/redux/Redux.java
@@ -19,7 +19,7 @@
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.zepalesque.redux.block.ReduxBlocks;
-import net.zepalesque.redux.blockset.ReduxWoodSets;
+import net.zepalesque.redux.blockset.wood.ReduxWoodSets;
 import net.zepalesque.redux.config.ReduxConfig;
 import net.zepalesque.redux.data.gen.ReduxBlockStateGen;
 import net.zepalesque.redux.data.gen.ReduxItemModelGen;

diff --git a/src/main/java/net/zepalesque/redux/blockset/wood/AetherWoodSet.java b/src/main/java/net/zepalesque/redux/blockset/wood/AetherWoodSet.java
@@ -1,4 +1,4 @@
-package net.zepalesque.redux.blockset;
+package net.zepalesque.redux.blockset.wood;
 
 import com.aetherteam.aether.mixin.mixins.common.accessor.FireBlockAccessor;
 import net.minecraft.data.recipes.RecipeCategory;

diff --git a/src/main/java/net/zepalesque/redux/blockset/wood/BaseWoodSet.java b/src/main/java/net/zepalesque/redux/blockset/wood/BaseWoodSet.java
@@ -1,4 +1,4 @@
-package net.zepalesque.redux.blockset;
+package net.zepalesque.redux.blockset.wood;
 
 import com.aetherteam.aether.AetherTags;
 import com.aetherteam.aether.block.natural.AetherLogBlock;
@@ -559,7 +559,7 @@ public DeferredHolder<BlockEntityType<?>, BlockEntityType<? extends ZenithHangin
 
     @Override
     protected BlockSetType setType(String id, SoundType sound) {
-        return new BlockSetType(
+        return BlockSetType.register(new BlockSetType(
                 id,
                 true,
                 true,
@@ -574,7 +574,7 @@ protected BlockSetType setType(String id, SoundType sound) {
                 SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_ON,
                 SoundEvents.WOODEN_BUTTON_CLICK_OFF,
                 SoundEvents.WOODEN_BUTTON_CLICK_ON
-        );
+        ));
     }
 
     @Override
@@ -584,14 +584,14 @@ public BlockSetType setType() {
 
     @Override
     protected WoodType woodType(String id, BlockSetType type, SoundType sound) {
-        return new WoodType(
+        return WoodType.register(new WoodType(
                 id,
                 type,
                 sound,
                 SoundType.HANGING_SIGN,
                 SoundEvents.FENCE_GATE_CLOSE,
                 SoundEvents.FENCE_GATE_OPEN
-        );
+        ));
     }
 
     @Override

diff --git a/src/main/java/net/zepalesque/redux/blockset/wood/ReduxWoodSets.java b/src/main/java/net/zepalesque/redux/blockset/wood/ReduxWoodSets.java
@@ -1,4 +1,4 @@
-package net.zepalesque.redux.blockset;
+package net.zepalesque.redux.blockset.wood;
 
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.MapColor;

diff --git a/src/main/java/net/zepalesque/redux/client/renderer/ReduxRenderers.java b/src/main/java/net/zepalesque/redux/client/renderer/ReduxRenderers.java
@@ -1,14 +1,10 @@
 package net.zepalesque.redux.client.renderer;
 
-import net.minecraft.client.renderer.blockentity.HangingSignRenderer;
-import net.minecraft.client.renderer.blockentity.SignRenderer;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import net.zepalesque.redux.Redux;
-import net.zepalesque.redux.blockset.BaseWoodSet;
-import net.zepalesque.redux.blockset.ReduxWoodSets;
 
 @Mod.EventBusSubscriber(modid = Redux.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class ReduxRenderers {