Merge branch 'develop'

Author: mineLdiver

gradle.properties

@@ -22,7 +22,7 @@ fabric.loom.multiProjectOptimisation=true
     spasm_version = 0.2.2
 
 # Mod Properties
-    mod_version = 2.0.0-alpha.6.1
+    mod_version = 2.0.0-alpha.6.2
     maven_group = net.modificationstation
     archives_base_name = StationAPI
 

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

@@ -2,7 +2,7 @@
 
 import net.mine_diver.unsafeevents.listener.EventListener;
 import net.minecraft.achievement.Achievement;
-import net.minecraft.item.Item;
+import net.modificationstation.sltest.block.Blocks;
 import net.modificationstation.sltest.item.ItemListener;
 import net.modificationstation.stationapi.api.client.gui.screen.achievement.AchievementPage;
 import net.modificationstation.stationapi.api.event.achievement.AchievementRegisterEvent;
@@ -20,7 +20,7 @@ public class AchievementListener {
     public void registerAchievements(AchievementRegisterEvent event) {
         testAchievementPage = new AchievementPageTest(NAMESPACE.id("testPage"));
         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);
+        testAchievementChild = new TemplateAchievement(NAMESPACE.id("test_achievement_child"), "sltest.testAchievementChild", 0, 2, Blocks.FREEZER.get(), testAchievement);
         event.achievements.add(testAchievement);
         event.achievements.add(testAchievementChild);
         testAchievementPage.addAchievements(testAchievement, testAchievementChild);

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

@@ -12,6 +12,8 @@
 import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.math.Direction;
 
+import static net.modificationstation.sltest.SLTest.NAMESPACE;
+
 public class ModdedPickaxeItem extends TemplatePickaxeItem implements CustomDispenseBehavior {
 
     public ModdedPickaxeItem(Identifier identifier, ToolMaterial material) {
@@ -28,7 +30,7 @@ public boolean useOnBlock(ItemStack item, PlayerEntity player, World level, int
             return true;
         } else if (facing == Direction.UP.ordinal()) {
             if (!level.isRemote) {
-                LivingEntity entity = (LivingEntity) EntityRegistry.create("GPoor", level);
+                LivingEntity entity = (LivingEntity) EntityRegistry.create(NAMESPACE.id("gpoor").toString(), level);
                 entity.setPosition(x + 0.5, y + 1, z + 0.5);
                 level.spawnEntity(entity);
                 entity.animateSpawn();
@@ -41,7 +43,7 @@ public boolean useOnBlock(ItemStack item, PlayerEntity player, World level, int
 
     @Override
     public void dispense(ItemDispenseContext context) {
-        LivingEntity entity = (LivingEntity) EntityRegistry.create("GPoor", context.dispenser.world);
+        LivingEntity entity = (LivingEntity) EntityRegistry.create(NAMESPACE.id("gpoor").toString(), context.dispenser.world);
         context.shootEntity(entity);
     }
 }

src/test/java/net/modificationstation/sltest/render/entity/EntityRendererListener.java

@@ -10,6 +10,6 @@ public class EntityRendererListener {
 
     @EventListener
     public void registerEntityRenderers(EntityRendererRegisterEvent event) {
-        event.renderers.put(PoorGuy.class, new UndeadEntityRenderer(new BipedEntityModel(), 0.5f));
+        event.register(PoorGuy.class, new UndeadEntityRenderer(new BipedEntityModel(), 0.5f));
     }
 }

station-achievements-v0/build.gradle.kts

@@ -1,11 +1,12 @@
-import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
 import net.modificationstation.stationapi.gradle.SubprojectHelpers.addModuleDependencies
+import net.modificationstation.stationapi.gradle.SubprojectHelpers.getSubprojectVersion
 
 base.archivesName.set("station-achievements-v0")
 version = getSubprojectVersion(project, "1.0.0")
 
 addModuleDependencies(project,
         "station-api-base",
         "station-resource-loader-v0",
-        "station-localization-api-v0"
+        "station-localization-api-v0",
+        "station-items-v0"
 )

station-achievements-v0/src/main/java/net/modificationstation/stationapi/impl/achievement/AchievementRegisterEventImpl.java

@@ -0,0 +1,25 @@
+package net.modificationstation.stationapi.impl.achievement;
+
+import net.mine_diver.unsafeevents.listener.EventListener;
+import net.minecraft.achievement.Achievements;
+import net.modificationstation.stationapi.api.StationAPI;
+import net.modificationstation.stationapi.api.event.achievement.AchievementRegisterEvent;
+import net.modificationstation.stationapi.api.event.registry.AfterBlockAndItemRegisterEvent;
+import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint;
+import net.modificationstation.stationapi.api.mod.entrypoint.EntrypointManager;
+import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy;
+
+import java.lang.invoke.MethodHandles;
+
+@Entrypoint(eventBus = @EventBusPolicy(registerInstance = false))
+public final class AchievementRegisterEventImpl {
+    static {
+        EntrypointManager.registerLookup(MethodHandles.lookup());
+    }
+
+    @EventListener
+    private static void dispatchAchievementRegisterEvent(AfterBlockAndItemRegisterEvent event) {
+        //noinspection unchecked
+        StationAPI.EVENT_BUS.post(AchievementRegisterEvent.builder().achievements(Achievements.ACHIEVEMENTS).build());
+    }
+}

station-achievements-v0/src/main/java/net/modificationstation/stationapi/mixin/achievement/AchievementsMixin.java

@@ -21,6 +21,9 @@
   "entrypoints": {
     "stationapi:event_bus_client": [
       "net.modificationstation.stationapi.impl.client.gui.screen.achievement.AchievementPageImpl"
+    ],
+    "stationapi:event_bus": [
+      "net.modificationstation.stationapi.impl.achievement.AchievementRegisterEventImpl"
     ]
   },
   "mixins": [

station-achievements-v0/src/main/resources/fabric.mod.json

@@ -3,9 +3,6 @@
   "minVersion": "0.8",
   "package": "net.modificationstation.stationapi.mixin.achievement",
   "compatibilityLevel": "JAVA_17",
-  "mixins": [
-    "AchievementsMixin"
-  ],
   "client": [
     "client.AchievementsScreenMixin"
   ],

station-achievements-v0/src/main/resources/station-achievements-v0.mixins.json

@@ -10,10 +10,101 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class BlockTags {
     public static final TagKey<Block>
-            LOGS = of("logs"),
-            LEAVES = of("leaves"),
-            PLANKS = of("planks"),
-            INFINIBURN = of("infiniburn");
+            BOOKSHELVES = of("c:bookshelves"),
+            BRICK_BLOCKS = of("c:brick_blocks"),
+            NORMAL_BRICK_BLOCKS = of("c:brick_blocks/normal"),
+            BUTTONS = of("c:buttons"),
+            STONE_BUTTONS = of("c:buttons/stone"),
+            CACTI = of("c:cacti"),
+            CHESTS = of("c:chests"),
+            WOODEN_CHESTS = of("c:chests/wooden"),
+            CLAY_BLOCKS = of("c:clay_blocks"),
+            COBBLESTONES = of("c:cobblestones"),
+            MOSSY_COBBLESTONES = of("c:cobblestones/mossy"),
+            NORMAL_COBBLESTONES = of("c:cobblestones/normal"),
+            DIRTS = of("c:dirts"),
+            DOORS = of("c:doors"),
+            IRON_DOORS = of("c:doors/iron"),
+            WOODEN_DOORS = of("c:doors/wooden"),
+            OAK_DOORS = of("c:doors/wooden/oak"),
+            FENCE_GATES = of("c:fence_gates"),
+            WOODEN_FENCE_GATES = of("c:fence_gates/wooden"),
+            FENCES = of("c:fences"),
+            WOODEN_FENCES = of("c:fences/wooden"),
+            OAK_FENCES = of("c:fences/wooden/oak"),
+            FLOWERS = of("c:flowers"),
+            NORMAL_FLOWERS = of("c:flowers/normal"),
+            TALL_FLOWERS = of("c:flowers/tall"),
+            GLASS_BLOCKS = of("c:glass_blocks"),
+            COLORLESS_GLASS_BLOCKS = of("c:glass_blocks/colorless"),
+            GRASS_BLOCKS = of("c:grass_blocks"),
+            GRAVELS = of("c:gravels"),
+            LADDERS = of("c:ladders"),
+            WOODEN_LADDERS = of("c:ladders/wooden"),
+            OAK_LADDERS = of("c:ladders/wooden/oak"),
+            LEAVES = of("c:leaves"),
+            LOGS = of("c:logs"),
+            MUSHROOMS = of("c:mushrooms"),
+            BROWN_MUSHROOMS = of("c:mushrooms/brown"),
+            RED_MUSHROOMS = of("c:mushrooms/red"),
+            NETHERRACKS = of("c:netherracks"),
+            OBSIDIANS = of("c:obsidians"),
+            NORMAL_OBSIDIANS = of("c:obsidians/normal"),
+            ORE_BEARING_GROUND_NETHERRACK = of("c:ore_bearing_ground/netherrack"),
+            ORE_BEARING_GROUND_STONE = of("c:ore_bearing_ground/stone"),
+            ORES = of("c:ores"),
+            COAL_ORES = of("c:ores/coal"),
+            DIAMOND_ORES = of("c:ores/diamond"),
+            GOLD_ORES = of("c:ores/gold"),
+            IRON_ORES = of("c:ores/iron"),
+            LAPIS_ORES = of("c:ores/lapis"),
+            REDSTONE_ORES = of("c:ores/redstone"),
+            PLANKS = of("c:planks"),
+            OAK_PLANKS = of("c:planks/oak"),
+            PRESSURE_PLATES = of("c:pressure_plates"),
+            STONE_PRESSURE_PLATES = of("c:pressure_plates/stone"),
+            WOODEN_PRESSURE_PLATES = of("c:pressure_plates/wooden"),
+            OAK_PRESSURE_PLATES = of("c:pressure_plates/wooden/oak"),
+            PUMPKINS = of("c:pumpkins"),
+            JACK_O_LANTERNS = of("c:pumpkins/jack_o_lanterns"),
+            NORMAL_PUMPKINS = of("c:pumpkins/normal"),
+            RAILS = of("c:rails"),
+            SANDS = of("c:sands"),
+            NORMAL_SANDS = of("c:sands/normal"),
+            SANDSTONE_BLOCKS = of("c:sandstone/blocks"),
+            NORMAL_SANDSTONE_BLOCKS = of("c:sandstone/normal_blocks"),
+            SAPLINGS = of("c:saplings"),
+            SIGNS = of("c:signs"),
+            WOODEN_SIGNS = of("c:signs/wooden"),
+            OAK_SIGNS = of("c:signs/wooden/oak"),
+            OAK_STANDING_SIGNS = of("c:signs/wooden/oak/standing"),
+            OAK_WALL_SIGNS = of("c:signs/wooden/oak/wall"),
+            SNOW = of("c:snow"),
+            STAIRS = of("c:stairs"),
+            COBBLESTONE_STAIRS = of("c:stairs/cobblestone"),
+            WOODEN_STAIRS = of("c:stairs/wooden"),
+            OAK_STAIRS = of("c:stairs/wooden/oak"),
+            STONES = of("c:stones"),
+            STORAGE_BLOCKS = of("c:storage_blocks"),
+            DIAMOND_STORAGE_BLOCKS = of("c:storage_blocks/diamond"),
+            GOLD_STORAGE_BLOCKS = of("c:storage_blocks/gold"),
+            IRON_STORAGE_BLOCKS = of("c:storage_blocks/iron"),
+            LAPIS_STORAGE_BLOCKS = of("c:storage_blocks/lapis"),
+            TRAPDOORS = of("c:trapdoors"),
+            WOODEN_TRAPDOORS = of("c:trapdoors/wooden"),
+            OAK_TRAPDOORS = of("c:trapdoors/wooden/oak"),
+            WOOLS = of("c:wools"),
+
+            INFINIBURN = of("infiniburn"),
+            MINEABLE_AXE = of("mineable/axe"),
+            MINEABLE_HOE = of("mineable/hoe"),
+            MINEABLE_PICKAXE = of("mineable/pickaxe"),
+            MINEABLE_SHEARS = of("mineable/shears"),
+            MINEABLE_SHOVEL = of("mineable/shovel"),
+            MINEABLE_SWORD = of("mineable/sword"),
+            NEEDS_DIAMOND_TOOL = of("needs_diamond_tool"),
+            NEEDS_IRON_TOOL = of("needs_iron_tool"),
+            NEEDS_STONE_TOOL = of("needs_stone_tool");
 
     private static TagKey<Block> of(String id) {
         return TagKey.of(BlockRegistry.KEY, Identifier.of(id));