chore: update to 1.20.1

KatCodesMods · Mar 5, 2024 · 7d2b780 · 7d2b780
1 parent 47b6c71
commit 7d2b780
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 39 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,8 @@ minecraft {
             // You can set various levels here.
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
-
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
                 "${mod_id}" {
                     source sourceSets.main
@@ -160,6 +161,10 @@ repositories {
             includeGroup "curse.maven"
         }
     }
+    maven {
+        name = 'tterrag maven'
+        url = 'https://maven.tterrag.com/'
+    }
     flatDir {
         dirs 'lib'
     }
@@ -191,28 +196,15 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
     runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
 
-    //curios
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}:api")
+    implementation fg.deobf("com.klikli_dev:occultism-${minecraft_version}:${occultism_version}"){ transitive = false }
+    //Occultism Transitive Dependencies
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}")
+    runtimeOnly fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}")
+    runtimeOnly fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_minecraft_version}:${smartbrainlib_version}")
+    runtimeOnly fg.deobf("com.klikli_dev:modonomicon-${minecraft_version}-forge:${modonomicon_version}")
 
-    //geckolib
-    implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_minecraft_version}:${geckolib_version}")
-
-    //smartbrainlib
-    implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_minecraft_version}:${smartbrainlib_version}")
-
-    //almostunified
-    implementation fg.deobf("com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almost_unified_version}")
-
-    //modonomicon
-    implementation fg.deobf("com.klikli_dev:modonomicon-${minecraft_version}-forge:${modonomicon_version}")
-
-    //theurgy
-    compileOnly fg.deobf("com.klikli_dev:theurgy-${minecraft_version}:${theurgy_version}"){transitive=false}
-    runtimeOnly fg.deobf("com.klikli_dev:theurgy-${minecraft_version}:${theurgy_version}"){transitive=false}
 
-    // at runtime, use the full JEI jar for Forge
-    implementation fg.deobf("com.klikli_dev:occultism-${minecraft_version}:${occultism_version}")
+    //JEI for testing
 
 
 }

diff --git a/gradle.properties b/gradle.properties
@@ -42,7 +42,7 @@ mapping_version=2023.06.26-1.20.1
 
 create_minecraft_version = 1.20.1
 flywheel_minecraft_version = 1.20.1
-create_version = 0.5.1.e-22
+create_version = 0.5.1.f-26
 flywheel_version = 0.6.10-7
 registrate_version = MC1.20-1.3.3
 occultism_version=1.119.0

diff --git a/src/main/java/dev/katcodes/occultcreate/OccultCreate.java b/src/main/java/dev/katcodes/occultcreate/OccultCreate.java
@@ -1,35 +1,21 @@
 package dev.katcodes.occultcreate;
 
 import com.mojang.logging.LogUtils;
-import com.simibubi.create.content.kinetics.fan.processing.AllFanProcessingTypes;
 import com.simibubi.create.content.kinetics.fan.processing.FanProcessingTypeRegistry;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
+
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
 import org.slf4j.Logger;
 
 import dev.katcodes.occultcreate.ProcessingTypes.SpiritProcessing;

diff --git a/src/main/java/dev/katcodes/occultcreate/ProcessingTypes/SpiritProcessing.java b/src/main/java/dev/katcodes/occultcreate/ProcessingTypes/SpiritProcessing.java
@@ -31,6 +31,7 @@
 public class SpiritProcessing implements FanProcessingType {
     private static final RecipeWrapper RECIPE_WRAPPER = new RecipeWrapper(new ItemStackHandler(1));
 
+
     @Override
     public boolean isValidAt(Level level, BlockPos pos) {
         return level.getBlockState(pos).getBlock() == OccultismBlocks.SPIRIT_FIRE.get();
@@ -61,7 +62,7 @@ public boolean canProcess(ItemStack stack, Level level) {
                 level.getRecipeManager().getRecipeFor(OccultismRecipes.SPIRIT_FIRE_TYPE.get(), fakeInventory, level);
 
         if(recipe.isPresent()) {
-            return RecipeApplier.applyRecipeOn(stack, recipe.get());
+            return RecipeApplier.applyRecipeOn(level,stack, recipe.get());
         }
 
         return Collections.emptyList();

diff --git a/src/main/java/dev/katcodes/occultcreate/compat/FanSpiritingCategory.java b/src/main/java/dev/katcodes/occultcreate/compat/FanSpiritingCategory.java
@@ -1,6 +1,7 @@
 package dev.katcodes.occultcreate.compat;
 
 import com.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe;
+import net.minecraft.client.gui.GuiGraphics;
 import org.jetbrains.annotations.NotNull;
 
 import com.klikli_dev.occultism.registry.OccultismBlocks;
@@ -25,12 +26,12 @@ protected AllGuiTextures getBlockShadow() {
     }
 
     @Override
-    protected void renderAttachedBlock(@NotNull PoseStack matrixStack) {
+    protected void renderAttachedBlock(GuiGraphics guiGraphics) {
         GuiGameElement.of(OccultismBlocks.SPIRIT_FIRE.get().defaultBlockState())
                 .scale(SCALE)
                 .atLocal(0, 0, 2)
                 .lighting(AnimatedKinetics.DEFAULT_LIGHTING)
-                .render(matrixStack);
+                .render(guiGraphics);
     }