Conflict resolution

Fureniku · Dec 18, 2023 · e49d6a3 · e49d6a3
1 parent e4148fa
commit e49d6a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/fureniku/metropolis/blocks/decorative/MetroBlockConnectingHorizontal.java b/src/main/java/com/fureniku/metropolis/blocks/decorative/MetroBlockConnectingHorizontal.java
@@ -1,6 +1,7 @@
 package com.fureniku.metropolis.blocks.decorative;
 
 import com.fureniku.metropolis.blocks.decorative.builders.MetroBlockDecorativeConnectingBuilder;
+import com.fureniku.metropolis.blocks.decorative.helpers.HelperBase;
 import com.fureniku.metropolis.datagen.MetroBlockStateProvider;
 import com.fureniku.metropolis.datagen.TextureSet;
 import com.fureniku.metropolis.enums.BlockOffsetDirection;
@@ -15,6 +16,8 @@
 import net.neoforged.neoforge.client.model.generators.BlockModelBuilder;
 import net.neoforged.neoforge.registries.RegistryObject;
 
+import java.util.ArrayList;
+
 public class MetroBlockConnectingHorizontal extends MetroBlockDecorative {
 
     protected static final BooleanProperty NORTH = BooleanProperty.create("north");
@@ -26,7 +29,7 @@ public class MetroBlockConnectingHorizontal extends MetroBlockDecorative {
     private boolean _checkDown = false;
 
     public MetroBlockConnectingHorizontal(Properties props, VoxelShape shape, String modelDir, String modelName, BlockOffsetDirection offsetDirection, boolean checkUp, boolean checkDown, TextureSet... textures) {
-        super(props, shape, modelDir, modelName, offsetDirection, textures);
+        super(props, shape, modelDir, modelName, new ArrayList<HelperBase>(), textures);
         _checkUp = checkUp;
         _checkDown = checkDown;
         this.registerDefaultState(this.stateDefinition.any().setValue(NORTH, false).setValue(EAST, false).setValue(SOUTH, false).setValue(WEST, false));

diff --git a/src/main/java/com/fureniku/metropolis/blocks/decorative/MetroBlockDecorative.java b/src/main/java/com/fureniku/metropolis/blocks/decorative/MetroBlockDecorative.java
@@ -87,7 +87,7 @@ public void generateBlockState(RegistryObject<Block> blockRegistryObject, MetroB
         for (int i = 0; i < _helpers.size(); i++) {
             if (_helpers.get(i) instanceof HelperBlockstate) {
                 HelperBlockstate helper = (HelperBlockstate) _helpers.get(i);
-                helper.generateBlockstate();
+                //helper.generateBlockstate();
                 generatedBlock = true;
             }
         }