Merge pull request #42 from UselessBullets/recipeFixes

BlockSound validation Fix + Server gameStart entrypoints

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.1-pre1
+bta_version=7.1-pre1a
 
 # Loader
-loader_version=0.14.19-babric.2-bta
+loader_version=0.14.19-babric.3-bta
 
 # Mod
-mod_version=3.0.3
+mod_version=3.0.4
 mod_group=turniplabs
 mod_name=halplibe
 

src/main/java/turniplabs/halplibe/mixin/mixins/MinecraftServerMixin.java

@@ -6,6 +6,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import turniplabs.halplibe.util.GameStartEntrypoint;
 import turniplabs.halplibe.util.RecipeEntrypoint;
 
 @Mixin(value = MinecraftServer.class, remap = false)
@@ -14,4 +15,13 @@ public class MinecraftServerMixin {
     public void recipeEntrypoint(CallbackInfoReturnable<Boolean> cir){
         FabricLoader.getInstance().getEntrypoints("recipesReady", RecipeEntrypoint.class).forEach(RecipeEntrypoint::onRecipesReady);
     }
+    @Inject(method = "startServer", at = @At("HEAD"))
+    public void beforeGameStartEntrypoint(CallbackInfoReturnable<Boolean> cir){
+        FabricLoader.getInstance().getEntrypoints("beforeGameStart", GameStartEntrypoint.class).forEach(GameStartEntrypoint::beforeGameStart);
+    }
+
+    @Inject(method = "startServer", at = @At("TAIL"))
+    public void afterGameStartEntrypoint(CallbackInfoReturnable<Boolean> cir){
+        FabricLoader.getInstance().getEntrypoints("afterGameStart", GameStartEntrypoint.class).forEach(GameStartEntrypoint::afterGameStart);
+    }
 }

src/main/resources/halplibe.mixins.json

@@ -10,6 +10,7 @@
     "accessors.EntityListAccessor",
     "accessors.LanguageAccessor",
     "accessors.TileEntityAccessor",
+    "mixins.BlockSoundDispatcherMixin",
     "mixins.BlockFireMixin",
     "mixins.I18nMixin",
     "mixins.ItemStackJsonAdapterMixin",
@@ -23,7 +24,6 @@
   "client": [
     "accessors.RenderManagerAccessor",
     "accessors.TileEntityRendererAccessor",
-    "mixins.BlockSoundDispatcherMixin",
     "mixins.EntityClientPlayerMPMixin",
     "mixins.GuiIngameMenuMixin",
     "mixins.MinecraftMixin",