Skip to content

Commit

Permalink
1.20.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
MEGATREX4 committed Aug 7, 2024
1 parent 43fb9ec commit 557dfba
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 34 deletions.
23 changes: 9 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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}"
Expand All @@ -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 {
Expand Down
17 changes: 9 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 + ")");
}
}
Original file line number Diff line number Diff line change
@@ -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()
Expand Down

0 comments on commit 557dfba

Please sign in to comment.