2.0.0-alpha.6

README.md

@@ -1,8 +1,6 @@
 # StationAPI for Minecraft Beta 1.7.3 Babric
 
-<!---
-Buildbot moment.
--->
+## For the code in actual releases, see the [main branch](https://github.com/ModificationStation/StationAPI/tree/main)
 
 A general use API for Fabric Loader mods on legacy Minecraft versions.
 

build.gradle.kts

@@ -28,6 +28,14 @@ allprojects {
         maven(url = "https://maven.glass-launcher.net/snapshots")
         maven(url = "https://maven.glass-launcher.net/releases")
         maven(url = "https://jitpack.io/")
+
+        maven("https://libraries.minecraft.net") {
+            name = "Mojang"
+            content {
+                includeModule("com.mojang", "datafixerupper") // https://github.com/Mojang/DataFixerUpper
+            }
+        }
+
         mavenCentral()
         exclusiveContent {
             forRepository {
@@ -130,7 +138,7 @@ allprojects {
 
     // Include license inside of the mod jar
     configure<Jar>("jar") {
-        from("LICENSE") {
+        from(rootProject.file("LICENSE")) {
             rename { "${it}_${project.properties["archivesBaseName"]}" }
         }
     }
@@ -294,4 +302,4 @@ tasks.register<Jar>("testJar") {
 // Gradle I swear to fuck stop trying to do bullshit to the maven - calm
 tasks.withType<GenerateModuleMetadata> {
     enabled = false
-}
+}

gradle.properties

@@ -18,11 +18,11 @@ fabric.loom.multiProjectOptimisation=true
     unsafeevents_version = e31096e
     fastutil_version = 8.5.8
     caffeine_version = 3.0.5
-    dfu_version = 6.0.6
+    dfu_version = 9.1.20
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.5.4
+    mod_version = 2.0.0-alpha.6
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 

src/test/java/net/modificationstation/sltest/achievement/AchievementListener.java

@@ -6,6 +6,7 @@
 import net.modificationstation.sltest.item.ItemListener;
 import net.modificationstation.stationapi.api.client.gui.screen.achievement.AchievementPage;
 import net.modificationstation.stationapi.api.event.achievement.AchievementRegisterEvent;
+import net.modificationstation.stationapi.api.template.achievement.TemplateAchievement;
 
 import static net.modificationstation.sltest.SLTest.NAMESPACE;
 
@@ -18,8 +19,8 @@ public class AchievementListener {
     @EventListener
     public void registerAchievements(AchievementRegisterEvent event) {
         testAchievementPage = new AchievementPageTest(NAMESPACE.id("testPage"));
-        testAchievement = new Achievement(69696969, "sltest.testAchievement", 0, 0, ItemListener.testItem, null);
-        testAchievementChild = new Achievement(69696970, "sltest.testAchievementChild", 0, 2, Item.GOLDEN_APPLE, testAchievement);
+        testAchievement = new TemplateAchievement(NAMESPACE.id("test_achievement"), "sltest.testAchievement", 0, 0, ItemListener.testItem, null);
+        testAchievementChild = new TemplateAchievement(NAMESPACE.id("test_achievement_child"), "sltest.testAchievementChild", 0, 2, Item.GOLDEN_APPLE, testAchievement);
         event.achievements.add(testAchievement);
         event.achievements.add(testAchievementChild);
         testAchievementPage.addAchievements(testAchievement, testAchievementChild);

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

@@ -21,26 +21,26 @@
 
 public enum Blocks {
 
-    TEST_BLOCK("test_block", "testBlock", id -> new TemplateBlock(id, Material.STONE).setHardness(1)),
-    TEST_ANIMATED_BLOCK("test_animated_block", "testAnimatedBlock", id -> new ModdedMetaBlock(id, Material.NETHER_PORTAL)),
-    CUSTOM_MODEL_BLOCK("farlands_block", "farlands_block", id -> new ModdedModelBlock(id, Material.SOIL).setHardness(1)),
-    FREEZER("freezer", "freezer", id -> new BlockFreezer(id).setHardness(2.5F).setSoundGroup(TemplateBlock.DEFAULT_SOUND_GROUP)),
-    ALTAR("altar", "altar", id -> new BlockAltar(id, Material.STONE).setHardness(3)),
-    VARIATION_BLOCK("variation_block", "variationBlock", id -> new VariationBlock(id, Material.STONE).setHardness(.5F).setSoundGroup(Block.DEFAULT_SOUND_GROUP).disableAutoItemRegistration()),
-    EMISSION_CHECKER("emission_checker", "emissionChecker", LampBlock::new),
-    INDISPENSABLE_BLOCK("indispensable_block", "indispensableBlock", IndispensableBlock::new),
-    MODDED_LEAVES("modded_leaves", "moddedLeaves", id -> new TemplateLeavesBlock(id, 52)),
-    MODDED_LOG("modded_log", "moddedLog", TemplateLogBlock::new),
-    EFFECT_BLOCK("effect_block", "effectBlock", EffectBlock::new),
-    EFFECT_BLOCK_INF("effect_block_inf", "effectBlockInf", EffectBlockInf::new),
-    EFFECT_BLOCK_CLEAR("effect_block_clear", "effectBlockClear", EffectBlockClear::new),
-    FANCY_WOOD_DOOR("fancy_wood_door_block", "fancyWoodDoor", id -> new TemplateDoorBlock(id, Material.WOOD));
+    TEST_BLOCK("test_block", id -> new TemplateBlock(id, Material.STONE).setHardness(1)),
+    TEST_ANIMATED_BLOCK("test_animated_block", id -> new ModdedMetaBlock(id, Material.NETHER_PORTAL)),
+    CUSTOM_MODEL_BLOCK("farlands_block", id -> new ModdedModelBlock(id, Material.SOIL).setHardness(1)),
+    FREEZER("freezer", id -> new BlockFreezer(id).setHardness(2.5F).setSoundGroup(TemplateBlock.DEFAULT_SOUND_GROUP)),
+    ALTAR("altar", id -> new BlockAltar(id, Material.STONE).setHardness(3)),
+    VARIATION_BLOCK("variation_block", id -> new VariationBlock(id, Material.STONE).setHardness(.5F).setSoundGroup(Block.DEFAULT_SOUND_GROUP).disableAutoItemRegistration()),
+    EMISSION_CHECKER("emission_checker", LampBlock::new),
+    INDISPENSABLE_BLOCK("indispensable_block", IndispensableBlock::new),
+    MODDED_LEAVES("modded_leaves", id -> new TemplateLeavesBlock(id, 52)),
+    MODDED_LOG("modded_log", TemplateLogBlock::new),
+    EFFECT_BLOCK("effect_block", EffectBlock::new),
+    EFFECT_BLOCK_INF("effect_block_inf", EffectBlockInf::new),
+    EFFECT_BLOCK_CLEAR("effect_block_clear", EffectBlockClear::new),
+    FANCY_WOOD_DOOR("fancy_wood_door_block", id -> new TemplateDoorBlock(id, Material.WOOD));
 
     private final Runnable register;
     private Block block;
 
-    Blocks(String id, String translationKey, Function<Identifier, Block> factory) {
-        this.register = () -> block = factory.apply(of(NAMESPACE, id)).setTranslationKey(NAMESPACE, translationKey);
+    Blocks(String id, Function<Identifier, Block> factory) {
+        this.register = () -> block = factory.apply(of(NAMESPACE, id));
     }
 
     public Block get() {

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

@@ -6,10 +6,10 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.modificationstation.stationapi.api.block.BlockState;
-import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.state.StateManager.Builder;
 import net.modificationstation.stationapi.api.state.property.BooleanProperty;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
+import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.world.BlockStateView;
 
 public class LampBlock extends TemplateBlock {
@@ -46,7 +46,7 @@ public int getTexture(int side) {
     public boolean onUse(World level, int x, int y, int z, PlayerEntity player) {
         BlockState state = level.getBlockState(x, y, z);
         state = state.with(ACTIVE, !state.get(ACTIVE));
-        level.setBlockState(x, y, z, state);
+        level.setBlockStateWithoutNotifyingNeighbors(x, y, z, state);
         return super.onUse(level, x, y, z, player);
     }
 }

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

@@ -1,22 +1,21 @@
 package net.modificationstation.sltest.block;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.World;
 import net.modificationstation.stationapi.api.block.BlockState;
-import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.state.StateManager;
 import net.modificationstation.stationapi.api.template.block.TemplateBlock;
+import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.math.Direction;
 
 import static net.modificationstation.stationapi.api.state.property.Properties.HORIZONTAL_FACING;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-
 public class ModdedModelBlock extends TemplateBlock {
 
-    private static final Direction[] DIRECTIONS = new Direction[] { Direction.WEST, Direction.NORTH, Direction.EAST, Direction.SOUTH };
+    private static final Direction[] DIRECTIONS = new Direction[] { Direction.SOUTH, Direction.WEST, Direction.NORTH, Direction.EAST};
 
     protected ModdedModelBlock(Identifier id, Material material) {
         super(id, material);
@@ -29,7 +28,7 @@ public boolean isOpaque() {
 
     @Override
     public void onPlaced(World level, int x, int y, int z, LivingEntity living) {
-        level.setBlockState(x, y, z, getDefaultState().with(HORIZONTAL_FACING, DIRECTIONS[MathHelper.floor((double)(living.yaw * 4.0F / 360.0F) + 0.5D) & 3]));
+        level.setBlockStateWithoutNotifyingNeighbors(x, y, z, getDefaultState().with(HORIZONTAL_FACING, DIRECTIONS[MathHelper.floor((double)(living.yaw * 4.0F / 360.0F) + 0.5D) & 3]));
     }
 
     @Override

src/test/java/net/modificationstation/sltest/dispenser/DispenserListener.java

@@ -43,7 +43,7 @@ public static void changeDispenseBehavior(DispenseEvent event) {
             // Make water buckets place water
             if (context.itemStack.itemId == Item.WATER_BUCKET.id) {
                 if (world.getMaterial(facing.x, facing.y, facing.z) == Material.AIR) {
-                    world.setBlockStateWithNotify(facing.x, facing.y, facing.z, Block.WATER.getDefaultState());
+                    world.setBlockState(facing.x, facing.y, facing.z, Block.WATER.getDefaultState());
                     context.dispenser.setStack(context.slot, new ItemStack(Item.BUCKET));
                     event.cancel();
                 }
@@ -52,7 +52,7 @@ public static void changeDispenseBehavior(DispenseEvent event) {
             // Make lava buckets place lava
             if (context.itemStack.itemId == Item.LAVA_BUCKET.id) {
                 if (world.getMaterial(facing.x, facing.y, facing.z) == Material.AIR) {
-                    world.setBlockStateWithNotify(facing.x, facing.y, facing.z, Block.LAVA.getDefaultState());
+                    world.setBlockState(facing.x, facing.y, facing.z, Block.LAVA.getDefaultState());
                     context.dispenser.setStack(context.slot, new ItemStack(Item.BUCKET));
                     event.cancel();
                 }

src/test/java/net/modificationstation/sltest/entity/EntityListener.java

@@ -1,7 +1,7 @@
 package net.modificationstation.sltest.entity;
 
 import net.mine_diver.unsafeevents.listener.EventListener;
-import net.modificationstation.stationapi.api.event.entity.EntityRegister;
+import net.modificationstation.stationapi.api.event.entity.EntityRegisterEvent;
 import net.modificationstation.stationapi.api.event.registry.EntityHandlerRegistryEvent;
 import net.modificationstation.stationapi.api.event.registry.MobHandlerRegistryEvent;
 
@@ -11,9 +11,9 @@
 public class EntityListener {
 
     @EventListener
-    public void registerEntities(EntityRegister event) {
-        event.register(TestEntity.class, "sltest:test");
-        event.register(PoorGuy.class, "GPoor");
+    public void registerEntities(EntityRegisterEvent event) {
+        event.register(NAMESPACE.id("test"), TestEntity.class);
+        event.register(NAMESPACE.id("gpoor"), PoorGuy.class);
     }
 
     @EventListener

src/test/java/net/modificationstation/sltest/item/ItemListener.java

@@ -30,20 +30,20 @@ public void registerItems(ItemRegistryEvent event) {
         ToolLevel.GRAPH.putEdge(siblingNode, ToolMaterial.IRON.getToolLevel());
         ToolLevel.GRAPH.removeEdge(ToolMaterial.STONE.getToolLevel(), ToolMaterial.IRON.getToolLevel());
 
-        testItem = new ModdedItem(NAMESPACE.id("test_item")).setTranslationKey(NAMESPACE, "testItem"); //8475
+        testItem = new ModdedItem(NAMESPACE.id("test_item")); //8475
         testMaterial = ToolMaterialFactory.create("testMaterial", 3, Integer.MAX_VALUE, Float.MAX_VALUE, Integer.MAX_VALUE - 2).toolLevel(siblingNode);
-        testPickaxe = new ModdedPickaxeItem(NAMESPACE.id("test_pickaxe"), testMaterial).setTranslationKey(NAMESPACE, "testPickaxe"); //8476
-        testNBTItem = new NBTItem(NAMESPACE.id("nbt_item")).setTranslationKey(NAMESPACE, "nbt_item"); //8477
-        testModelItem = new ModelItem(NAMESPACE.id("model_item")).setMaxCount(1).setTranslationKey(NAMESPACE, "idkSomething");
-        ironOre = event.register(NAMESPACE.id("ironOre"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("ironOre"));
-        generatedItem = event.register(NAMESPACE.id("generated_item"), new Item(ItemRegistry.AUTO_ID)).setTranslationKey(NAMESPACE.id("generatedItem"));
-        variationBlockIdle = new BlockStateItem(NAMESPACE.id("variation_block_idle"), Blocks.VARIATION_BLOCK.get().getDefaultState()).setTranslationKey(NAMESPACE, "variationBlockIdle");
-        variationBlockPassive = new BlockStateItem(NAMESPACE.id("variation_block_passive"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.PASSIVE)).setTranslationKey(NAMESPACE, "variationBlockPassive");
-        variationBlockActive = new BlockStateItem(NAMESPACE.id("variation_block_active"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.ACTIVE)).setTranslationKey(NAMESPACE, "variationBlockActive");
-        testShears = new TestShearsItem(NAMESPACE.id("test_shears")).setTranslationKey(NAMESPACE, "test_shears");
-        pacifistSword = new PacifistSwordItem(NAMESPACE.id("pacifist_sword")).setTranslationKey(NAMESPACE, "pacifist_sword");
-        dullPickaxe = new DullPickaxeItem(NAMESPACE.id("dull_pickaxe")).setTranslationKey(NAMESPACE, "dull_pickaxe");
-        fancyDoor = new TemplateDoorItem(NAMESPACE.id("fancy_wood_door"), Material.WOOD, Blocks.FANCY_WOOD_DOOR.get()).setTranslationKey(NAMESPACE, "fancyWoodDoor");
+        testPickaxe = new ModdedPickaxeItem(NAMESPACE.id("test_pickaxe"), testMaterial); //8476
+        testNBTItem = new NBTItem(NAMESPACE.id("nbt_item")); //8477
+        testModelItem = new ModelItem(NAMESPACE.id("model_item")).setMaxCount(1);
+        ironOre = event.register(NAMESPACE.id("iron_ore"), new Item(ItemRegistry.AUTO_ID));
+        generatedItem = event.register(NAMESPACE.id("generated_item"), new Item(ItemRegistry.AUTO_ID));
+        variationBlockIdle = new BlockStateItem(NAMESPACE.id("variation_block_idle"), Blocks.VARIATION_BLOCK.get().getDefaultState());
+        variationBlockPassive = new BlockStateItem(NAMESPACE.id("variation_block_passive"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.PASSIVE));
+        variationBlockActive = new BlockStateItem(NAMESPACE.id("variation_block_active"), Blocks.VARIATION_BLOCK.get().getDefaultState().with(VariationBlock.VARIANT, VariationBlock.Variant.ACTIVE));
+        testShears = new TestShearsItem(NAMESPACE.id("test_shears"));
+        pacifistSword = new PacifistSwordItem(NAMESPACE.id("pacifist_sword"));
+        dullPickaxe = new DullPickaxeItem(NAMESPACE.id("dull_pickaxe"));
+        fancyDoor = new TemplateDoorItem(NAMESPACE.id("fancy_wood_door"), Material.WOOD, Blocks.FANCY_WOOD_DOOR.get());
 
     }
 

src/test/java/net/modificationstation/sltest/item/ModdedItem.java

@@ -29,7 +29,7 @@ public ItemStack use(ItemStack item, World level, PlayerEntity player) {
             MessagePacket message = new MessagePacket(Identifier.of(SLTest.NAMESPACE, "send_an_object"));
             hmmSho = new Random().nextInt();
             SLTest.LOGGER.info(String.valueOf(hmmSho));
-            message.objects = new Object[] { new TestNetworkData(hmmSho) };
+//            message.objects = new Object[] { new TestNetworkData(hmmSho) };
             PacketHelper.sendTo(player, message);
         }
         return super.use(item, level, player);

src/test/java/net/modificationstation/sltest/keyboard/KeyboardListener.java

@@ -3,17 +3,24 @@
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.modificationstation.sltest.SLTest;
 import net.modificationstation.sltest.option.OptionListener;
+import net.modificationstation.sltest.packet.MineLMomentPacket;
 import net.modificationstation.stationapi.api.client.event.keyboard.KeyStateChangedEvent;
 import net.modificationstation.stationapi.api.network.packet.MessagePacket;
 import net.modificationstation.stationapi.api.network.packet.PacketHelper;
 import net.modificationstation.stationapi.api.util.Identifier;
 import org.lwjgl.input.Keyboard;
 
 public class KeyboardListener {
-
     @EventListener
     public static void keyStateChange(KeyStateChangedEvent event) {
-        if (event.environment == KeyStateChangedEvent.Environment.IN_GAME && Keyboard.getEventKey() == OptionListener.testBind.code)
-            PacketHelper.send(new MessagePacket(Identifier.of(SLTest.NAMESPACE, "give_me_diamonds")));
+        if (event.environment == KeyStateChangedEvent.Environment.IN_GAME) {
+            if (Keyboard.getEventKey() == OptionListener.testBind.code) {
+                PacketHelper.send(new MessagePacket(Identifier.of(SLTest.NAMESPACE, "give_me_diamonds")));
+            }
+
+            if (Keyboard.getEventKey() == OptionListener.mineLMoment.code) {
+                PacketHelper.send(new MineLMomentPacket(0));
+            }
+        }
     }
 }

src/test/java/net/modificationstation/sltest/mixin/MixinObsidian.java

@@ -6,20 +6,12 @@
 import net.modificationstation.stationapi.api.block.BlockState;
 import net.modificationstation.stationapi.api.block.StationBlock;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import java.awt.image.BufferedImage;
-import java.awt.image.DataBufferInt;
 
 @Mixin(ObsidianBlock.class)
 public abstract class MixinObsidian implements StationBlock {
     @Override
     public boolean onBonemealUse(World world, int x, int y, int z, BlockState state) {
-        world.setBlockState(x, y, z, Block.LOG.getDefaultState());
+        world.setBlockStateWithoutNotifyingNeighbors(x, y, z, Block.LOG.getDefaultState());
         System.out.println(x + " " + y + " " + z);
         return true;
     }

src/test/java/net/modificationstation/sltest/option/OptionListener.java

@@ -5,15 +5,16 @@
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.client.option.KeyBinding;
 import net.modificationstation.stationapi.api.client.event.option.KeyBindingRegisterEvent;
+import org.lwjgl.input.Keyboard;
 
 public class OptionListener {
-
+    public static KeyBinding testBind;
+    public static KeyBinding mineLMoment;
+
     @Environment(EnvType.CLIENT)
     @EventListener
     public void registerKeyBindings(KeyBindingRegisterEvent event) {
-        testBind = new KeyBinding("key.sltest.testBind", 21);
-        event.keyBindings.add(testBind);
+        event.register(testBind = new KeyBinding("key.sltest.testBind", 21));
+        event.register(mineLMoment = new KeyBinding("key.sltest.mine_l_moment", Keyboard.KEY_L));
     }
-
-    public static KeyBinding testBind;
 }

src/test/java/net/modificationstation/sltest/packet/MessageListenerListener.java

@@ -24,6 +24,6 @@ public void handleGiveMeDiamonds(PlayerEntity playerBase, MessagePacket message)
     }
 
     public void handleSendCoords(PlayerEntity playerBase, MessagePacket message) {
-        SLTest.LOGGER.info(String.valueOf(((ModdedItem.TestNetworkData) message.objects[0]).getHmmSho()));
+//        SLTest.LOGGER.info(String.valueOf(((ModdedItem.TestNetworkData) message.objects[0]).getHmmSho()));
     }
 }