Merge pull request #84 from Uraneptus/1.20.x-no_compat

removed compat

build.gradle

@@ -97,12 +97,8 @@ dependencies {
 
     compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}")
     implementation fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
-    implementation fg.deobf("curse.maven:farmers-delight-398521:4679319")
-    //runtimeOnly fg.deobf("curse.maven:quark-243121:4140000")
-    //runtimeOnly fg.deobf("curse.maven:autoreglib-250363:4100299")
     runtimeOnly fg.deobf("curse.maven:catalogue-459701:4590890")
     //runtimeOnly fg.deobf("curse.maven:configured-457570:4011355")
-    //runtimeOnly fg.deobf("curse.maven:abnormals-delight-442719:4371935")
 
 }
 

src/generated/resources/assets/sullysmod/lang/en_us.json

@@ -64,18 +64,14 @@
   "item.minecraft.splash_potion.effect.unluck": "Splash Potion of Bad Luck",
   "item.minecraft.tipped_arrow.effect.unluck": "Arrow of Bad Luck",
   "item.sullysmod.bouldering_zombie_spawn_egg": "Bouldering Zombie Spawn Egg",
-  "item.sullysmod.cave_chum_bucket": "Cave Chum Bucket",
   "item.sullysmod.cooked_lanternfish": "Cooked Lanternfish",
-  "item.sullysmod.cooked_lanternfish_slice": "Cooked Lanternfish Slice",
   "item.sullysmod.cooked_piranha": "Cooked Piranha",
   "item.sullysmod.glass_vial": "Glass Vial",
   "item.sullysmod.jade_horse_armor": "Jade Horse Armor",
   "item.sullysmod.jade_shield": "Jade Shield",
   "item.sullysmod.jungle_spider_spawn_egg": "Jungle Spider Spawn Egg",
   "item.sullysmod.lanternfish": "Raw Lanternfish",
   "item.sullysmod.lanternfish_bucket": "Bucket of Lanternfish",
-  "item.sullysmod.lanternfish_roll": "Lanternfish Roll",
-  "item.sullysmod.lanternfish_slice": "Raw Lanternfish Slice",
   "item.sullysmod.lanternfish_spawn_egg": "Lanternfish Spawn Egg",
   "item.sullysmod.music_disc_scour": "Music Disc",
   "item.sullysmod.music_disc_scour.desc": "LudoCrypt - scour",

src/generated/resources/data/forge/tags/items/cooked_fishes/lanternfish.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "sullysmod:cooked_lanternfish",
-    "sullysmod:cooked_lanternfish_slice"
+    "sullysmod:cooked_lanternfish"
   ]
 }

src/generated/resources/data/forge/tags/items/raw_fishes/lanternfish.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "sullysmod:lanternfish",
-    "sullysmod:lanternfish_slice"
+    "sullysmod:lanternfish"
   ]
 }

src/generated/resources/data/sullysmod/modifiers/advancements/husbandry/balanced_diet.json

@@ -4,16 +4,6 @@
       "type": "criteria",
       "config": {
         "criteria": {
-          "sullysmod:cave_chum_bucket": {
-            "conditions": {
-              "item": {
-                "items": [
-                  "sullysmod:cave_chum_bucket"
-                ]
-              }
-            },
-            "trigger": "minecraft:consume_item"
-          },
           "sullysmod:cooked_lanternfish": {
             "conditions": {
               "item": {
@@ -24,16 +14,6 @@
             },
             "trigger": "minecraft:consume_item"
           },
-          "sullysmod:cooked_lanternfish_slice": {
-            "conditions": {
-              "item": {
-                "items": [
-                  "sullysmod:cooked_lanternfish_slice"
-                ]
-              }
-            },
-            "trigger": "minecraft:consume_item"
-          },
           "sullysmod:cooked_piranha": {
             "conditions": {
               "item": {
@@ -54,26 +34,6 @@
             },
             "trigger": "minecraft:consume_item"
           },
-          "sullysmod:lanternfish_roll": {
-            "conditions": {
-              "item": {
-                "items": [
-                  "sullysmod:lanternfish_roll"
-                ]
-              }
-            },
-            "trigger": "minecraft:consume_item"
-          },
-          "sullysmod:lanternfish_slice": {
-            "conditions": {
-              "item": {
-                "items": [
-                  "sullysmod:lanternfish_slice"
-                ]
-              }
-            },
-            "trigger": "minecraft:consume_item"
-          },
           "sullysmod:piranha": {
             "conditions": {
               "item": {
@@ -97,18 +57,6 @@
           ],
           [
             "sullysmod:cooked_piranha"
-          ],
-          [
-            "sullysmod:lanternfish_slice"
-          ],
-          [
-            "sullysmod:cooked_lanternfish_slice"
-          ],
-          [
-            "sullysmod:lanternfish_roll"
-          ],
-          [
-            "sullysmod:cave_chum_bucket"
           ]
         ],
         "should_replace_requirements": false

src/main/java/com/uraneptus/sullysmod/SullysMod.java

@@ -16,7 +16,6 @@
 import com.uraneptus.sullysmod.core.data.server.tags.SMBlockTagsProvider;
 import com.uraneptus.sullysmod.core.data.server.tags.SMEntityTagsProvider;
 import com.uraneptus.sullysmod.core.data.server.tags.SMItemTagsProvider;
-import com.uraneptus.sullysmod.core.integration.fd.FDCompat;
 import com.uraneptus.sullysmod.core.other.SMTextDefinitions;
 import com.uraneptus.sullysmod.core.registry.*;
 import net.minecraft.core.HolderLookup;
@@ -64,12 +63,7 @@ public SullysMod() {
         SMRecipeTypes.RECIPE_TYPES.register(bus);
         SMRecipeSerializer.SERIALIZERS.register(bus);
 
-        FDCompat.register();
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> SMItems::buildCreativeTabContents);
-        if (FDCompat.IS_LOADED) {
-            DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> SMItems::buildFDCreativeTabContents);
-        }
-
 
         MinecraftForge.EVENT_BUS.register(this);
     }
@@ -110,7 +104,7 @@ public void gatherData(GatherDataEvent event) {
         generator.addProvider(includeClient, new SMBlockStateProvider(packOutput, fileHelper));
         generator.addProvider(includeClient, new SMItemModelProvider(packOutput, fileHelper));
         generator.addProvider(includeClient, new SMSoundDefinitionsProvider(packOutput, fileHelper));
-        generator.addProvider(includeClient, new SMLangProvider(packOutput));
+        generator.addProvider(includeClient, new SMLangProvider(packOutput, SullysMod.MOD_ID));
         generator.addProvider(includeClient, new SMSpriteSourceProvider(packOutput, fileHelper));
 
         SMBlockTagsProvider blockTagProvider = new SMBlockTagsProvider(packOutput, lookupProvider, fileHelper);

src/main/java/com/uraneptus/sullysmod/core/data/SMDatagenUtil.java

@@ -37,8 +37,6 @@ public class SMDatagenUtil {
     public static final String ROUGH_JADE_BRICKS = name(SMBlocks.ROUGH_JADE_BRICKS.get());
     public static final String SMOOTHED_ROUGH_JADE = name(SMBlocks.SMOOTHED_ROUGH_JADE.get());
     public static final String ROUGH_JADE_TILES = name(SMBlocks.ROUGH_JADE_TILES.get());
-    //Quark Flag (We're going to need this a fair amount once that wood gets added)
-    public static ResourceLocation QUARK_FLAG = SullysMod.blueprintPrefix("quark_flag");
 
     @SafeVarargs
     public static HolderSet<PlacedFeature> getPlacedHolderSet(BootstapContext<?> context, ResourceKey<PlacedFeature>... placedFeatures) {

src/main/java/com/uraneptus/sullysmod/core/data/client/SMBlockStateProvider.java

@@ -1,6 +1,5 @@
 package com.uraneptus.sullysmod.core.data.client;
 
-import com.teamabnormals.blueprint.common.block.VerticalSlabBlock;
 import com.uraneptus.sullysmod.SullysMod;
 import com.uraneptus.sullysmod.common.blocks.FlingerTotem;
 import com.uraneptus.sullysmod.core.registry.SMBlocks;
@@ -61,15 +60,6 @@ protected void registerStatesAndModels() {
         modSlabBlock(SMBlocks.ROUGH_JADE_BRICK_SLAB, ROUGH_JADE_BRICKS);
         modSlabBlock(SMBlocks.SMOOTHED_ROUGH_JADE_SLAB, SMOOTHED_ROUGH_JADE);
         modSlabBlock(SMBlocks.ROUGH_JADE_TILE_SLAB, ROUGH_JADE_TILES);
-        /*
-        modVerticalSlabBlock(SMBlocks.POLISHED_JADE_BRICK_VERTICAL_SLAB, JADE_BRICKS);
-        modVerticalSlabBlock(SMBlocks.POLISHED_SMALL_JADE_BRICK_VERTICAL_SLAB, SMALL_JADE_BRICKS);
-        modVerticalSlabBlock(SMBlocks.POLISHED_JADE_SHINGLE_VERTICAL_SLAB, JADE_SHINGLES);
-        modVerticalSlabBlock(SMBlocks.POLISHED_JADE_TILE_VERTICAL_SLAB, JADE_TILES);
-        modVerticalSlabBlock(SMBlocks.ROUGH_JADE_BRICK_VERTICAL_SLAB, ROUGH_JADE_BRICKS);
-        modVerticalSlabBlock(SMBlocks.SMOOTHED_ROUGH_JADE_VERTICAL_SLAB, SMOOTHED_ROUGH_JADE);
-        modVerticalSlabBlock(SMBlocks.ROUGH_JADE_TILE_VERTICAL_SLAB, ROUGH_JADE_TILES);
-         */
         modEggBlock(SMBlocks.TORTOISE_EGG);
     }
 
@@ -161,19 +151,4 @@ private void modEggBlock(Supplier<? extends Block> block) {
                     .build();
         });
     }
-
-    private void modVerticalSlabBlock(Supplier<? extends Block> slab, String path) {
-        ModelFile model = this.models()
-                .withExistingParent(name(slab.get()), blueprintBlockLocation("vertical_slab"))
-                .texture("top", modBlockLocation(path))
-                .texture("bottom", modBlockLocation(path))
-                .texture("side", modBlockLocation(path));
-
-        getVariantBuilder(slab.get())
-                .partialState().with(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.NORTH).addModels(new ConfiguredModel(model, 0, 0, true))
-                .partialState().with(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.SOUTH).addModels(new ConfiguredModel(model, 0, 180, true))
-                .partialState().with(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.EAST).addModels(new ConfiguredModel(model, 0, 90, true))
-                .partialState().with(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.WEST).addModels(new ConfiguredModel(model, 0, 270, true))
-                .partialState().with(VerticalSlabBlock.TYPE, VerticalSlabBlock.VerticalSlabType.DOUBLE).addModels(new ConfiguredModel(this.models().getExistingFile(modBlockLocation(path))));
-    }
 }