1.0.4.b

DragonsPlusMinecraft · Apr 3, 2024 · 7d6e886 · 7d6e886
1 parent 1b2399e
commit 7d6e886
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 28 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
         run: ./gradlew build
 
       - name: Publish (CurseForge/Modrinth)
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           # Modrinth
           modrinth-id: RZwVw5iA
@@ -48,8 +48,7 @@ jobs:
           version: ${{ env.VERSION }}
           version-type: release
           changelog-file: changelog/${{ env.VERSION }}.md
-          files-primary: build/libs/*-${{ env.VERSION }}!(-@(dev|sources|slim)).jar
-          files-secondary: ""
+          files: build/libs/*-${{ env.VERSION }}!(-@(dev|sources|slim)).jar
 
           loaders: |
             forge

diff --git a/changelog/1.0.4.b.md b/changelog/1.0.4.b.md
@@ -0,0 +1,6 @@
+## Drink Beer Refill 1.0.4.b
+
+### Bugfix
+- Fix model missing for some mixed beers
+- Fix creative tab order issue
+
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # mod version info
-mod_version = 1.0.4
+mod_version = 1.0.4.b
 artifact_minecraft_version = 1.20.1
 minecraft_version = 1.20.1
 forge_version = 47.0.1
@@ -17,9 +17,9 @@ librarian_version = 1.+
 parchment_version = 1.19.3-2023.03.12
 
 # Dependency Versions
-jei_minecraft_version = 1.20
-jei_version = 14.0.0.11
-jade_version = 11.0.3
+jei_minecraft_version = 1.20.1
+jei_version = 15.3.0.4
+jade_version = 11.8.0
 jade_project_id = 324717
-jade_file_id = 4573193
+jade_file_id = 5072729
 
diff --git a/src/main/java/lekavar/lma/drinkbeer/registries/CreativeTabRegistry.java b/src/main/java/lekavar/lma/drinkbeer/registries/CreativeTabRegistry.java
@@ -4,15 +4,17 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.RegistryObject;
 
 public class CreativeTabRegistry {
     public static final DeferredRegister<CreativeModeTab> TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, DrinkBeer.MOD_ID);
-    public static final RegistryObject<CreativeModeTab> GENERAL = TABS.register("general", () -> CreativeModeTab.builder()
+    public static final RegistryObject<CreativeModeTab> GENERAL = TABS.register("drinkbeer.general", () -> CreativeModeTab.builder()
             .title(Component.translatable("itemGroup.drinkbeer.general"))
             .icon(() -> new ItemStack(BlockRegistry.BEER_BARREL.get()))
+            .withTabsBefore(CreativeModeTabs.SPAWN_EGGS)
             .displayItems((parameters, output) -> {
                 output.accept(ItemRegistry.BEER_BARREL.get());
                 output.accept(ItemRegistry.BARTENDING_TABLE.get());
@@ -48,9 +50,10 @@ public class CreativeTabRegistry {
                 output.accept(ItemRegistry.SPICE_DRIED_SELAGINELLA.get());
             }).build());
 
-    public static final RegistryObject<CreativeModeTab> BEER = TABS.register("beer", () -> CreativeModeTab.builder()
+    public static final RegistryObject<CreativeModeTab> BEER = TABS.register("drinkbeer.beer", () -> CreativeModeTab.builder()
             .title(Component.translatable("itemGroup.drinkbeer.beer"))
             .icon(() -> new ItemStack(BlockRegistry.BEER_BARREL.get()))
+            .withTabsBefore(GENERAL.getId())
             .displayItems((parameters, output) -> {
                 output.accept(ItemRegistry.BEER_MUG.get());
                 output.accept(ItemRegistry.BEER_MUG_BLAZE_STOUT.get());

diff --git a/src/main/resources/assets/drinkbeer/models/item/example_separate_perspective.temp b/src/main/resources/assets/drinkbeer/models/item/example_separate_perspective.temp
diff --git a/src/main/resources/assets/drinkbeer/models/item/mixed_beer.json b/src/main/resources/assets/drinkbeer/models/item/mixed_beer.json
@@ -41,13 +41,13 @@
       "predicate": {
         "beer_id": 0.06
       },
-      "model": "drinkbeer:block//beer_mug_haars_icey_pale_lager"
+      "model": "drinkbeer:block/beer_mug_haars_icey_pale_lager"
     },
     {
       "predicate": {
         "beer_id": 0.07
       },
-      "model": "drinkbeer:block//beer_mug_pumpkin_kvass"
+      "model": "drinkbeer:block/beer_mug_pumpkin_kvass"
     },
     {
       "predicate": {
@@ -59,7 +59,7 @@
       "predicate": {
         "beer_id": 0.09
       },
-      "model": "drinkbeer:block//beer_mug_night_howl_kvass"
+      "model": "drinkbeer:block/beer_mug_night_howl_kvass"
     }
   ]
 }