diff --git a/build.gradle b/build.gradle index 56b7ba7..258e332 100644 --- a/build.gradle +++ b/build.gradle @@ -15,20 +15,11 @@ repositories { maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.shedaniel.me/" } maven { url "https://maven.terraformersmc.com/releases/" } - - exclusiveContent { - forRepository { - maven { - name = "Modrinth" - url = "https://api.modrinth.com/maven" - } - } - filter { - includeGroup "maven.modrinth" - } - } + maven { url "https://api.modrinth.com/maven" } + maven { url "https://repo.spongepowered.org/maven"} } + fabricApi { configureDataGeneration() } @@ -47,7 +38,7 @@ dependencies { modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" // Farmers Delight API - modImplementation "maven.modrinth:farmers-delight-fabric:${project.farmersdelight_version}" + modCompileOnly "maven.modrinth:farmers-delight-refabricated:${project.farmersdelight_version}" // Mod Menu (optional) modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" @@ -56,7 +47,11 @@ dependencies { modCompileOnly "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}" // Jade compatibility - modImplementation "maven.modrinth:jade:${project.jade_version}" + compileOnly "maven.modrinth:jade:${project.jade_version}" + + compileOnly "org.spongepowered:mixin:0.8.5" + + modCompileOnly "maven.modrinth:Patchouli:${patchouli_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index 323cb5f..9dc6e60 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,30 +1,31 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20 -yarn_mappings=1.20+build.1 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 loader_version=0.15.11 # rei # architectury_version=9.1.10 -rei_api_version=12.1.725 -rei_version=12.1.725 +rei_api_version=12.1.740 +rei_version=12.1.740 # Jade jade_version=11.10.0+fabric #Dependencies -farmersdelight_version:1.4.2 -fabric_version=0.83.0+1.20 +farmersdelight_version:1.20.1-2.1.1 +fabric_version=0.92.2+1.20.1 +patchouli_version = 1.20.1-84-fabric #Optional modmenu_version=7.0.1 clothconfig_version=11.1.106 # Mod Properties -mod_version= a0.5.0 +mod_version= 0.5-alpha+1.20.1 maven_group=com.megatrex4.ukrainian_dlight archives_base_name=ukrainian-delight diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/BrewingKegBlock.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/BrewingKegBlock.java index 815eb1c..0492007 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/BrewingKegBlock.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/custom/BrewingKegBlock.java @@ -7,10 +7,6 @@ import com.megatrex4.ukrainian_dlight.util.CompoundTagUtils; import com.megatrex4.ukrainian_dlight.util.FluidStack; -import com.nhoryzon.mc.farmersdelight.block.state.CookingPotSupport; -import com.nhoryzon.mc.farmersdelight.entity.block.CookingPotBlockEntity; -import com.nhoryzon.mc.farmersdelight.registry.BlockEntityTypesRegistry; -import com.nhoryzon.mc.farmersdelight.registry.ParticleTypesRegistry; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; @@ -219,7 +215,7 @@ public static void spawnParticles(World world, BlockPos pos, BlockState state) { // Debug particle spawn // System.out.println("Spawning steam"); double motionY = random.nextBoolean() ? .015d : .005d; - world.addParticle(ParticleTypesRegistry.STEAM.get(), baseX, baseY, baseZ, .0d, motionY, .0d); + world.addParticle(ParticleTypes.SMOKE, baseX, baseY, baseZ, .0d, motionY, .0d); } } } diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java index 850147c..1d66e1a 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/BrewingKegBlockEntity.java @@ -10,8 +10,6 @@ import com.megatrex4.ukrainian_dlight.util.CompoundTagUtils; import com.megatrex4.ukrainian_dlight.util.FluidStack; - -import com.nhoryzon.mc.farmersdelight.entity.block.CookingPotBlockEntity; import io.netty.buffer.Unpooled; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/ItemStackInventory.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/ItemStackInventory.java index 3e6966e..cb74fc0 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/ItemStackInventory.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/ItemStackInventory.java @@ -1,7 +1,7 @@ package com.megatrex4.ukrainian_dlight.block.entity.inventory; import com.megatrex4.ukrainian_dlight.util.CompoundTagUtils; -import com.nhoryzon.mc.farmersdelight.exception.SlotInvalidRangeException; + import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventories; import net.minecraft.inventory.Inventory; diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/SlotInvalidRangeException.java b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/SlotInvalidRangeException.java new file mode 100644 index 0000000..c5a342c --- /dev/null +++ b/src/main/java/com/megatrex4/ukrainian_dlight/block/entity/inventory/SlotInvalidRangeException.java @@ -0,0 +1,8 @@ +package com.megatrex4.ukrainian_dlight.block.entity.inventory; + + +public class SlotInvalidRangeException extends RuntimeException { + public SlotInvalidRangeException(int slotNumber, int maxRange) { + super("Slot " + slotNumber + " not in valid range - [0," + maxRange + ")"); + } +} diff --git a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java index fbb5e2d..a84744f 100644 --- a/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java +++ b/src/main/java/com/megatrex4/ukrainian_dlight/item/ModFoodComponents.java @@ -1,15 +1,15 @@ package com.megatrex4.ukrainian_dlight.item; -import com.nhoryzon.mc.farmersdelight.registry.EffectsRegistry; +import vectorwing.farmersdelight.common.registry.ModEffects; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; + public class ModFoodComponents { // Retrieve the StatusEffect instances using the EffectsRegistry - public static final StatusEffect COMFORT = EffectsRegistry.COMFORT.get(); - public static final StatusEffect NOURISHMENT = EffectsRegistry.NOURISHMENT.get(); + public static final StatusEffect COMFORT = ModEffects.COMFORT.get(); + public static final StatusEffect NOURISHMENT = ModEffects.NOURISHMENT.get(); // MEALS public static final FoodComponent VARENYK = new FoodComponent.Builder()