1.20 further progress

xanthian · Jul 15, 2023 · 2618cc9 · 2618cc9
1 parent 60bf496
commit 2618cc9
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,7 @@ repositories {
     maven { url 'https://maven.shedaniel.me/' }       // Required for Cloth Config
     maven { url 'https://maven.ryanliptak.com/' }     // Required for AppleSkin
     maven { url 'https://maven.minecraftforge.net/' } // Required for TerraBlender
+    maven { url "https://maven.resourcefulbees.com/repository/maven-public/" }
     maven { url "https://cursemaven.com/"
         content {
             includeGroup "curse.maven"
@@ -59,6 +60,11 @@ dependencies {
 
     // Ad Astra
     modImplementation("curse.maven:adastra-635042:4643678")
+        modApi ("com.teamresourceful.resourcefullib:resourcefullib-fabric-1.20.1:2.1.3")
+        modApi ("curse.maven:resourcefulconfig-714059:4576456")
+        //modApi ("curse.maven:botarium-704113:4594093")
+        modApi "earth.terrarium:botarium-fabric-1.20:2.1.1"
+        modRuntimeOnly("com.github.glitchfiend:TerraBlender-fabric:1.20.1-3.0.0.167")
 
     // BetterArcheology
     modImplementation("curse.maven:betterarcheology-835687:4600694")

diff --git a/src/main/java/net/xanthian/variantcraftingtables/Initialise.java b/src/main/java/net/xanthian/variantcraftingtables/Initialise.java
@@ -70,7 +70,7 @@ public void onInitialize() {
 
         Vanilla.registerTables();
 
-        if (!FabricLoader.getInstance().isModLoaded("ad_astra")) {
+        if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
             AdAstra.registerTables();
         }
         if (!FabricLoader.getInstance().isModLoaded("betterarcheology")) {

diff --git a/src/main/java/net/xanthian/variantcraftingtables/datagen/LangFileGenerator.java b/src/main/java/net/xanthian/variantcraftingtables/datagen/LangFileGenerator.java
@@ -7,6 +7,7 @@
 
 import net.xanthian.variantcraftingtables.Initialise;
 import net.xanthian.variantcraftingtables.block.*;
+import net.xanthian.variantcraftingtables.block.compatability.*;
 
 public class LangFileGenerator extends FabricLanguageProvider {
     public LangFileGenerator(FabricDataOutput dataOutput) {
@@ -30,6 +31,20 @@ public void generateTranslations(TranslationBuilder translationBuilder) {
         translationBuilder.add(Vanilla.SPRUCE_CRAFTING_TABLE, "Spruce Crafting Table");
         translationBuilder.add(Vanilla.WARPED_CRAFTING_TABLE, "Warped Crafting Table");
 
+        translationBuilder.add(AdAstra.AA_AERONOS_CRAFTING_TABLE, "Aeronos Crafting Table");
+        translationBuilder.add(AdAstra.AA_GLACIAN_CRAFTING_TABLE, "Glacian Crafting Table");
+        translationBuilder.add(AdAstra.AA_STROPHAR_CRAFTING_TABLE, "Strophar Crafting Table");
+
+        translationBuilder.add(BetterArcheology.BA_ROTTEN_CRAFTING_TABLE, "Rotten Crafting Table");
+
+        translationBuilder.add(HellionsSniffer.HS_STONE_PINE_CRAFTING_TABLE, "Stone Pine Crafting Table");
+
+        translationBuilder.add(Promenade.PROM_DARK_AMARANTH_CRAFTING_TABLE, "Dark Amaranth Crafting Table");
+        translationBuilder.add(Promenade.PROM_MAPLE_CRAFTING_TABLE, "Maple Crafting Table");
+        translationBuilder.add(Promenade.PROM_PALM_CRAFTING_TABLE, "Palm Crafting Table");
+        translationBuilder.add(Promenade.PROM_SAKURA_CRAFTING_TABLE, "Sakura Crafting Table");
+
+        translationBuilder.add(TechReborn.TR_RUBBER_CRAFTING_TABLE, "Rubber Crafting Table");
 
     }
 }
diff --git a/src/main/java/net/xanthian/variantcraftingtables/datagen/ModelGenerator.java b/src/main/java/net/xanthian/variantcraftingtables/datagen/ModelGenerator.java
@@ -33,9 +33,9 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
         blockStateModelGenerator.registerCubeWithCustomTextures(Vanilla.CRIMSON_CRAFTING_TABLE, Blocks.CRIMSON_PLANKS, TextureMap::frontSideWithCustomBottom);
         blockStateModelGenerator.registerCubeWithCustomTextures(Vanilla.WARPED_CRAFTING_TABLE, Blocks.WARPED_PLANKS, TextureMap::frontSideWithCustomBottom);
 
-        blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_AERONOS_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.AERONOS_PLANKS, TextureMap::frontSideWithCustomBottom);
-        //blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_GLACIAN_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.GLACIAN_PLANKS, TextureMap::frontSideWithCustomBottom);
-        //blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_STROPHAR_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.STROPHAR_PLANKS, TextureMap::frontSideWithCustomBottom);
+        blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_AERONOS_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.AERONOS_PLANKS.get(), TextureMap::frontSideWithCustomBottom);
+        blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_GLACIAN_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.GLACIAN_PLANKS.get(), TextureMap::frontSideWithCustomBottom);
+        blockStateModelGenerator.registerCubeWithCustomTextures(AdAstra.AA_STROPHAR_CRAFTING_TABLE, earth.terrarium.ad_astra.common.registry.ModBlocks.STROPHAR_PLANKS.get(), TextureMap::frontSideWithCustomBottom);
 
         blockStateModelGenerator.registerCubeWithCustomTextures(BetterArcheology.BA_ROTTEN_CRAFTING_TABLE, ModBlocks.ROTTEN_PLANKS, TextureMap::frontSideWithCustomBottom);
 

diff --git a/src/main/java/net/xanthian/variantcraftingtables/datagen/RecipeGenerator.java b/src/main/java/net/xanthian/variantcraftingtables/datagen/RecipeGenerator.java
@@ -1,28 +1,25 @@
 package net.xanthian.variantcraftingtables.datagen;
 
-
 import com.helliongames.snifferplus.registration.SnifferPlusItems;
 import earth.terrarium.ad_astra.common.registry.ModItems;
 import fr.hugman.promenade.registry.content.*;
 import net.Pandarix.betterarcheology.block.ModBlocks;
+import techreborn.init.TRContent;
+
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
-
 import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions;
 
 import net.minecraft.advancement.criterion.InventoryChangedCriterion;
 import net.minecraft.data.server.recipe.*;
-import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.Items;
-import net.minecraft.recipe.Ingredient;
 import net.minecraft.recipe.book.RecipeCategory;
 import net.minecraft.util.Identifier;
 
 import net.xanthian.variantcraftingtables.block.Vanilla;
 import net.xanthian.variantcraftingtables.block.compatability.*;
 
 import net.xanthian.variantcraftingtables.util.ModItemTags;
-import techreborn.init.TRContent;
 
 import java.util.function.Consumer;
 
@@ -45,9 +42,9 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
         offer2x2CompactingRecipe(exporter, RecipeCategory.MISC, Vanilla.CRIMSON_CRAFTING_TABLE, Items.CRIMSON_PLANKS);
         offer2x2CompactingRecipe(exporter, RecipeCategory.MISC, Vanilla.WARPED_CRAFTING_TABLE, Items.WARPED_PLANKS);
 
-        //offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_AERONOS_CRAFTING_TABLE, ModItems.);
-        //offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_AERONOS_CRAFTING_TABLE, Registries.ITEM.get(new Identifier("adastra:aeronos_planks")));
-        //offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_AERONOS_CRAFTING_TABLE, Registries.ITEM.get(new Identifier("adastra:aeronos_planks")));
+        offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_AERONOS_CRAFTING_TABLE, ModItems.AERONOS_PLANKS.get());
+        offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_GLACIAN_CRAFTING_TABLE, ModItems.GLACIAN_PLANKS.get());
+        offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("ad_astra")),RecipeCategory.MISC, AdAstra.AA_STROPHAR_CRAFTING_TABLE, ModItems.STROPHAR_PLANKS.get());
 
         offer2x2CompactingRecipe(withConditions(exporter,DefaultResourceConditions.allModsLoaded("betterarcheology")),RecipeCategory.MISC, BetterArcheology.BA_ROTTEN_CRAFTING_TABLE, ModBlocks.ROTTEN_PLANKS);
 

diff --git a/src/main/java/net/xanthian/variantcraftingtables/util/ModRegistries.java b/src/main/java/net/xanthian/variantcraftingtables/util/ModRegistries.java
@@ -6,8 +6,7 @@
 import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
 
 import net.xanthian.variantcraftingtables.block.Vanilla;
-import net.xanthian.variantcraftingtables.block.compatability.Promenade;
-import net.xanthian.variantcraftingtables.block.compatability.TechReborn;
+import net.xanthian.variantcraftingtables.block.compatability.*;
 
 public class ModRegistries {
 
@@ -31,14 +30,25 @@ private static void registerFuel() {
         registry.add(Vanilla.MANGROVE_CRAFTING_TABLE,300);
         registry.add(Vanilla.SPRUCE_CRAFTING_TABLE,300);
 
-        if (FabricLoader.getInstance().isModLoaded("techreborn")) {
-            registry.add(TechReborn.TR_RUBBER_CRAFTING_TABLE, 300);
+        if (FabricLoader.getInstance().isModLoaded("ad_astra")) {
+            registry.add(AdAstra.AA_AERONOS_CRAFTING_TABLE, 300);
+            registry.add(AdAstra.AA_GLACIAN_CRAFTING_TABLE, 300);
+            registry.add(AdAstra.AA_STROPHAR_CRAFTING_TABLE, 300);
+        }
+        if (FabricLoader.getInstance().isModLoaded("betterarcheology")) {
+            registry.add(BetterArcheology.BA_ROTTEN_CRAFTING_TABLE, 300);
+        }
+        if (FabricLoader.getInstance().isModLoaded("snifferplus")) {
+            registry.add(HellionsSniffer.HS_STONE_PINE_CRAFTING_TABLE, 300);
         }
         if (FabricLoader.getInstance().isModLoaded("promenade")) {
             registry.add(Promenade.PROM_DARK_AMARANTH_CRAFTING_TABLE,300);
             registry.add(Promenade.PROM_MAPLE_CRAFTING_TABLE,300);
             registry.add(Promenade.PROM_PALM_CRAFTING_TABLE,300);
             registry.add(Promenade.PROM_SAKURA_CRAFTING_TABLE,300);
         }
+        if (FabricLoader.getInstance().isModLoaded("techreborn")) {
+            registry.add(TechReborn.TR_RUBBER_CRAFTING_TABLE, 300);
+        }
     }
 }