Merge remote-tracking branch 'origin/main'

xYundy · May 17, 2024 · 18a2ee1 · 18a2ee1
2 parents 3f858c6 + 3ad7296
commit 18a2ee1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/README.MD b/README.MD
@@ -45,7 +45,7 @@
 [![Supported Game Supported Versions][modrinth-supported-game-versions-shield]][modrinth-supported-game-versions-url]
 
   <p align="center">
-    A Minecraft mod for Fabric modloader which adds new blocks, items & other Vanilla+/Create themed stuff.
+    A Minecraft: Java Edition mod for Fabric modloader which adds new blocks, items & other Vanilla+/Create themed stuff.
     <br />
     <a href="#installation"><strong>Go to installation guide »</strong></a></li>
     <br />

diff --git a/src/client/java/pl/xyundy/squaredadditions/block/entity/MixedSlabBlockEntityRenderer.java b/src/client/java/pl/xyundy/squaredadditions/block/entity/MixedSlabBlockEntityRenderer.java
@@ -23,7 +23,6 @@ public void render(MixedSlabBlockEntity entity, float tickDelta, MatrixStack mat
 
         BlockRenderManager manager = MinecraftClient.getInstance().getBlockRenderManager();
 
-
         RenderLayer layerTop = entity.topSlabState.isTransparent(world, pos) ? RenderLayer.getTranslucent() : RenderLayer.getSolid();
         RenderLayer layerBot = entity.bottomSlabState.isTransparent(world, pos) ? RenderLayer.getTranslucent() : RenderLayer.getSolid();
 

diff --git a/src/main/java/pl/xyundy/squaredadditions/SquaredAdditions.java b/src/main/java/pl/xyundy/squaredadditions/SquaredAdditions.java
@@ -10,7 +10,7 @@
 
 public class SquaredAdditions implements ModInitializer {
 	public static final String MOD_ID = "squaredadditions";
-    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+  public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 
 	@Override
 	public void onInitialize() {

diff --git a/src/main/java/pl/xyundy/squaredadditions/block/MixedSlabBlock.java b/src/main/java/pl/xyundy/squaredadditions/block/MixedSlabBlock.java
@@ -54,6 +54,7 @@ public void onSteppedOn(World world, BlockPos blockPos, BlockState blockState, E
 
     @Override
     public float getBlastResistance() {
+        //TODO check if correct slabs are saved
         return Math.max(this.topSlabState.getBlock().getBlastResistance(), this.bottomSlabState.getBlock().getBlastResistance());
     }
 }
diff --git a/src/main/java/pl/xyundy/squaredadditions/config/SquaredAdditionsConfig.java b/src/main/java/pl/xyundy/squaredadditions/config/SquaredAdditionsConfig.java
@@ -5,5 +5,4 @@
 public class SquaredAdditionsConfig extends MidnightConfig {
     @Entry public static boolean suppressStatementAPILogger = true;
     @Entry public static boolean showEnhancedSlabLines = true;
-
 }
diff --git a/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java b/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java
@@ -90,6 +90,7 @@ public static void itemGroupCombat(FabricItemGroupEntries entries) {
         entries.add(EMERALD_LEGGINGS);
         entries.add(EMERALD_BOOTS);
     }
+
     public static void itemGroupTools(FabricItemGroupEntries entries) {
         entries.add(COPPER_PICKAXE);
         entries.add(COPPER_SHOVEL);

diff --git a/src/main/java/pl/xyundy/squaredadditions/slabs/Slabs.java b/src/main/java/pl/xyundy/squaredadditions/slabs/Slabs.java
@@ -15,7 +15,6 @@
 
 public class Slabs {
     public static final RuntimeResourcePack SLABS_RESOURCES = RuntimeResourcePack.create("squaredadditionsslabs:resources", 15);
-
     public static final Map<PlayerEntity, SlabLockEnum> slabLockPosition = new HashMap<>();
 
     public static void initialize() {
@@ -36,4 +35,4 @@ public static void initialize() {
             slabLockPosition.put(player, slabLockBuf);
         });
     }
-}
+}