Merge pull request #242 from ModificationStation/develop

2.0.0-alpha.5.3

Author: mineLdiver

build.gradle.kts

@@ -75,7 +75,9 @@ allprojects {
         "transitiveImplementation"(implementation("com.mojang:datafixerupper:${project.properties["dfu_version"]}") as Dependency)
         "transitiveImplementation"(implementation("maven.modrinth:spasm:${project.properties["spasm_version"]}") as Dependency)
         "transitiveImplementation"(implementation("me.carleslc:Simple-Yaml:1.8.4") as Dependency)
-        "transitiveImplementation"(modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}") as Dependency)
+
+        // not a runtime dependency unless we use something outside its events.
+        modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.properties["gcapi_version"]}")
 
         // convenience stuff
         // adds some useful annotations for data classes. does not add any dependencies

gradle.properties

@@ -10,7 +10,7 @@ fabric.loom.multiProjectOptimisation=true
 # Fabric Properties
 # check these on https://fabricmc.net/use
     minecraft_version = b1.7.3
-    yarn_mappings = b1.7.3+cbcfb39
+    yarn_mappings = b1.7.3+e1fe071
     loader_version = 0.16.9
 
 # Library Properties
@@ -22,11 +22,11 @@ fabric.loom.multiProjectOptimisation=true
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.5.2
+    mod_version = 2.0.0-alpha.5.3
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 
 # Test properties
-    gcapi_version = 3.1.0
+    gcapi_version = 3.2.5
     modmenu_version = 1.8.5-beta.11
     rc_version = 0.5.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/test/java/net/modificationstation/sltest/block/BlockAltar.java

@@ -1,6 +1,6 @@
 package net.modificationstation.sltest.block;
 
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.modificationstation.sltest.texture.TextureListener;
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;

src/test/java/net/modificationstation/sltest/block/BlockFreezer.java

@@ -6,8 +6,8 @@
 package net.modificationstation.sltest.block;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.Material;
 import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -36,7 +36,7 @@ public class BlockFreezer extends TemplateBlockWithEntity
 
     protected BlockFreezer(Identifier blockID)
     {
-        super(blockID, Material.field_998);
+        super(blockID, Material.SNOW_LAYER);
         FrozenRand = new Random();
     }
 
@@ -74,14 +74,14 @@ private void setDefaultDirection(World world, int i, int j, int k)
         {
             byte0 = 4;
         }
-        world.method_215(i, j, k, byte0);
+        world.setBlockMeta(i, j, k, byte0);
     }
 
     @Override
     public void randomDisplayTick(World world, int i, int j, int k, Random random)
     {
-        TileEntityFreezer tileentity = (TileEntityFreezer)world.method_1777(i, j, k);
-        if(world.isRemote ? tileentity.method_1069() == 1 : tileentity.isBurning())
+        TileEntityFreezer tileentity = (TileEntityFreezer)world.getBlockEntity(i, j, k);
+        if(world.isRemote ? tileentity.getPushedBlockData() == 1 : tileentity.isBurning())
         {
             float f = (float)i + 0.5F;
             float f1 = (float)j + 1.0F + (random.nextFloat() * 6F) / 16F;
@@ -112,7 +112,7 @@ public int getTexture(int i)
     @Override
     public boolean onUse(World world, int i, int j, int k, PlayerEntity entityplayer)
     {
-        BlockEntity tileentityFreezer = world.method_1777(i, j, k);
+        BlockEntity tileentityFreezer = world.getBlockEntity(i, j, k);
         if (tileentityFreezer instanceof TileEntityFreezer freezer)
             GuiHelper.openGUI(entityplayer, of(NAMESPACE, "freezer"), freezer, new ContainerFreezer(entityplayer.inventory, freezer));
         return true;
@@ -121,9 +121,9 @@ public boolean onUse(World world, int i, int j, int k, PlayerEntity entityplayer
     public static void updateFreezerBlockState(boolean flag, World world, int i, int j, int k)
     {
         int l = world.getBlockMeta(i, j, k);
-        BlockEntity tileentity = world.method_1777(i, j, k);
+        BlockEntity tileentity = world.getBlockEntity(i, j, k);
         world.setBlock(i, j, k, l);
-        world.method_157(i, j, k, tileentity);
+        world.setBlockEntity(i, j, k, tileentity);
     }
 
     @Override
@@ -138,26 +138,26 @@ public void onPlaced(World world, int i, int j, int k, LivingEntity entityliving
         int l = MathHelper.floor((double)((entityliving.yaw * 4F) / 360F) + 0.5D) & 3;
         if(l == 0)
         {
-            world.method_215(i, j, k, 2);
+            world.setBlockMeta(i, j, k, 2);
         }
         if(l == 1)
         {
-            world.method_215(i, j, k, 5);
+            world.setBlockMeta(i, j, k, 5);
         }
         if(l == 2)
         {
-            world.method_215(i, j, k, 3);
+            world.setBlockMeta(i, j, k, 3);
         }
         if(l == 3)
         {
-            world.method_215(i, j, k, 4);
+            world.setBlockMeta(i, j, k, 4);
         }
     }
 
     @Override
     public void onBreak(World world, int i, int j, int k)
     {
-        TileEntityFreezer tileentityFreezer = (TileEntityFreezer)world.method_1777(i, j, k);
+        TileEntityFreezer tileentityFreezer = (TileEntityFreezer)world.getBlockEntity(i, j, k);
 label0:
         for(int l = 0; l < tileentityFreezer.size(); l++)
         {
@@ -186,7 +186,7 @@ public void onBreak(World world, int i, int j, int k)
                 entityitem.velocityX = (float)FrozenRand.nextGaussian() * f3;
                 entityitem.velocityY = (float)FrozenRand.nextGaussian() * f3 + 0.2F;
                 entityitem.velocityZ = (float)FrozenRand.nextGaussian() * f3;
-                world.method_210(entityitem);
+                world.spawnEntity(entityitem);
             } while(true);
         }
 

src/test/java/net/modificationstation/sltest/block/Blocks.java

@@ -2,7 +2,7 @@
 
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.block.Block;
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.modificationstation.sltest.mixin.BlockBaseAccessor;
 import net.modificationstation.stationapi.api.event.registry.BlockRegistryEvent;
 import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;

src/test/java/net/modificationstation/sltest/block/ColouredBlock.java

@@ -1,7 +1,7 @@
 package net.modificationstation.sltest.block;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.minecraft.world.BlockView;
 
 public class ColouredBlock extends Block {

src/test/java/net/modificationstation/sltest/block/EffectBlock.java

@@ -1,6 +1,6 @@
 package net.modificationstation.sltest.block;
 
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;

src/test/java/net/modificationstation/sltest/block/EffectBlockClear.java

@@ -1,10 +1,9 @@
 package net.modificationstation.sltest.block;
 
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.modificationstation.sltest.SLTest;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
 import net.modificationstation.stationapi.api.util.Identifier;
 

src/test/java/net/modificationstation/sltest/block/EffectBlockInf.java

@@ -1,6 +1,6 @@
 package net.modificationstation.sltest.block;
 
-import net.minecraft.block.Material;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;