From 953ca6470c8dd36404ff243d31e81cf4d796c4c3 Mon Sep 17 00:00:00 2001 From: player005 Date: Sun, 13 Oct 2024 13:11:42 +0200 Subject: [PATCH] it compiles! --- .../Fabric_Server___fabric__fabric.xml | 2 +- .../vegandelightfabric/VeganDelightMod.java | 7 ++-- .../vegandelightfabric/VeganItems.java | 38 +++++++++---------- fabric/build.gradle.kts | 16 ++++++-- .../client/VeganDelightClient.java | 8 ++-- neoforge/build.gradle.kts | 6 ++- .../vegandelightfabric/VeganDelightNeo.java | 27 ++++++------- 7 files changed, 57 insertions(+), 47 deletions(-) diff --git a/.idea/runConfigurations/Fabric_Server___fabric__fabric.xml b/.idea/runConfigurations/Fabric_Server___fabric__fabric.xml index 2900900..4fd4d03 100644 --- a/.idea/runConfigurations/Fabric_Server___fabric__fabric.xml +++ b/.idea/runConfigurations/Fabric_Server___fabric__fabric.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java b/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java index 60bf668..36e80a6 100644 --- a/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java +++ b/common/src/main/java/net/player005/vegandelightfabric/VeganDelightMod.java @@ -6,6 +6,7 @@ import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.item.trading.ItemCost; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.block.ComposterBlock; import net.minecraft.world.level.levelgen.GenerationStep; @@ -35,20 +36,20 @@ private static void registerBiomeModifers() { platform.overworldBiomeTag(), platform.undergroundBiomeTag(), GenerationStep.Decoration.VEGETAL_DECORATION, - ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation("vegandelight:patch_wild_soybean")) + ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse("vegandelight:patch_wild_soybean")) ); } private static void registerTrades() { platform.registerVillagerTrade(VillagerProfession.FARMER, 1, (trader, random) -> new MerchantOffer( - new ItemStack(VeganItems.SOYBEAN, random.nextIntBetweenInclusive(16, 24)), + new ItemCost(VeganItems.SOYBEAN, random.nextIntBetweenInclusive(16, 24)), new ItemStack(Items.EMERALD, 1), 12, 5, 0.05f )); platform.registerVillagerTrade(VillagerProfession.LEATHERWORKER, 4, (trader, random) -> new MerchantOffer( - new ItemStack(VeganItems.LEATHER_SUBSTITUTE, random.nextIntBetweenInclusive(8, 16)), + new ItemCost(VeganItems.LEATHER_SUBSTITUTE, random.nextIntBetweenInclusive(8, 16)), new ItemStack(Items.EMERALD, 1), 12, 15, 0.1f )); diff --git a/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java b/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java index 8ae7bae..f959277 100644 --- a/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java +++ b/common/src/main/java/net/player005/vegandelightfabric/VeganItems.java @@ -20,89 +20,89 @@ public class VeganItems { public static final Item TOFU = register("tofu", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item SILKEN_TOFU = register("silken_tofu", new ConsumableItem(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()) .craftRemainder(Items.BOWL) .stacksTo(16))); public static final Item SMOKED_TOFU = register("smoked_tofu", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item COOKED_TOFU = register("cooked_tofu", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item COOKED_SMOKED_TOFU = register("cooked_smoked_tofu", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(4) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item TOFU_SLICES = register("tofu_slices", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item SMOKED_TOFU_SLICES = register("smoked_tofu_slices", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item COOKED_TOFU_SLICES = register("cooked_tofu_slices", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item COOKED_SMOKED_TOFU_SLICES = register("cooked_smoked_tofu_slices", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item MINCED_TOFU = register("minced_tofu", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item TOFU_PATTY = register("tofu_patty", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item TOFISH = register("tofish", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(3) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item COOKED_TOFISH = register("cooked_tofish", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(3) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item SMOKED_TOFISH = register("smoked_tofish", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(3) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item COOKED_SMOKED_TOFISH = register("cooked_smoked_tofish", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(3) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item TOFISH_ROLL = register("tofish_roll", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(5) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); public static final Item SMOKED_TOFISH_ROLL = register("smoked_tofish_roll", new Item(new Item.Properties().food(new FoodProperties.Builder() .nutrition(5) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()))); @@ -126,7 +126,7 @@ public class VeganItems { new ItemNameBlockItem(VeganBlocks.SOYBEAN_CROP, new Item.Properties().food(new FoodProperties.Builder() .nutrition(1) - .saturationMod(0.1f) + .saturationModifier(0.1f) .build()))); public static final Item LEATHER_SUBSTITUTE = register("leather_substitute", @@ -135,7 +135,7 @@ public class VeganItems { public static final Item APPLESAUCE = register("applesauce", new ConsumableItem(new Item.Properties().food(new FoodProperties.Builder() .nutrition(2) - .saturationMod(0.4f) + .saturationModifier(0.4f) .build()) .craftRemainder(Items.BOWL) .stacksTo(16))); diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index 53e2eec..e371643 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -14,7 +14,7 @@ val FABRIC_API_VERSION: String by rootProject.extra val FDRF_VERSION: String by rootProject.extra repositories { - maven("https://maven.parchmentmc.org/") + maven("https://maven.parchmentmc.org/") // Parchment mappings maven { // Farmer's Delight Refabricated name = "Greenhouse Maven" @@ -80,6 +80,16 @@ tasks { jar { from(rootDir.resolve("LICENSE.md")) + + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + + named("compileTestJava").configure { + enabled = false + } + + named("test").configure { + enabled = false } } @@ -98,5 +108,5 @@ dependencies { exclude("io.github.fabricators_of_create.Porting-Lib") } - compileOnly(project(":common")) -} \ No newline at end of file + implementation(project.project(":common").sourceSets.getByName("main").output) +} diff --git a/fabric/src/client/java/net/player005/vegandelightfabric/client/VeganDelightClient.java b/fabric/src/client/java/net/player005/vegandelightfabric/client/VeganDelightClient.java index e6beea7..358f3f5 100644 --- a/fabric/src/client/java/net/player005/vegandelightfabric/client/VeganDelightClient.java +++ b/fabric/src/client/java/net/player005/vegandelightfabric/client/VeganDelightClient.java @@ -34,8 +34,8 @@ public void onInitializeClient() { VeganFluids.APPLESAUCE, VeganFluids.FLOWING_APPLESAUCE, new SimpleFluidRenderHandler( - new ResourceLocation("vegandelight:block/applesauce_still"), - new ResourceLocation("vegandelight:block/applesauce_flow") + ResourceLocation.parse("vegandelight:block/applesauce_still"), + ResourceLocation.parse("vegandelight:block/applesauce_flow") ) ); @@ -43,8 +43,8 @@ public void onInitializeClient() { VeganFluids.SOYMILK, VeganFluids.FLOWING_SOYMILK, new SimpleFluidRenderHandler( - new ResourceLocation("vegandelight:block/milky_still"), - new ResourceLocation("vegandelight:block/milky_flow") + ResourceLocation.parse("vegandelight:block/milky_still"), + ResourceLocation.parse("vegandelight:block/milky_flow") ) ); diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 27b6c7b..a588317 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -85,11 +85,15 @@ tasks.named("compileTestJava").configure { dependencies { implementation("net.neoforged:neoforge:${NEOFORGE_VERSION}") - compileOnly(project.project(":common").sourceSets.main.get().output) + + implementation(project.project(":common").sourceSets.getByName("main").output) implementation("maven.modrinth:farmers-delight:$FD_NEO_VERSION") } +tasks.jar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} // NeoGradle compiles the game, but we don't want to add our common code to the game's code val notNeoTask: (Task) -> Boolean = { it: Task -> !it.name.startsWith("neo") && !it.name.startsWith("compileService") } diff --git a/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java b/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java index 8534162..cb28e8d 100644 --- a/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java +++ b/neoforge/src/main/java/net/player005/vegandelightfabric/VeganDelightNeo.java @@ -14,8 +14,8 @@ import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.neoforged.bus.api.IEventBus; +import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; -import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.village.VillagerTradesEvent; import net.neoforged.neoforge.registries.DeferredRegister; import org.jetbrains.annotations.NotNull; @@ -27,35 +27,31 @@ public class VeganDelightNeo { public static IEventBus eventBus; - public VeganDelightNeo(IEventBus eventBus) { + public VeganDelightNeo(@NotNull IEventBus eventBus) { VeganDelightNeo.eventBus = eventBus; + eventBus.addListener(VeganDelightNeo::onVillagerTrades); VeganDelightMod.initialize(new VDNeoforgePlatform()); } - @Mod.EventBusSubscriber(modid = "vegandelight") - public static class EventSubscriber { - public EventSubscriber() { - NeoForge.EVENT_BUS.register(this); - } - - public static void onVillagerTrades(VillagerTradesEvent event) { - for (VillagerTrade trade : VDNeoforgePlatform.registeredTrades) { - if (event.getType() == trade.profession) { - var levelTrades = event.getTrades().get(trade.level); + @SubscribeEvent + public static void onVillagerTrades(VillagerTradesEvent event) { + for (VillagerTrade trade : VDNeoforgePlatform.registeredTrades) { + if (event.getType() == trade.profession) { + var levelTrades = event.getTrades().get(trade.level); - levelTrades.add(trade.itemListing); - } + levelTrades.add(trade.itemListing); } } } + public static class VDNeoforgePlatform implements VeganDelightPlatform { public static final List registeredTrades = new ArrayList<>(); @Override public TagKey undergroundBiomeTag() { - return TagKey.create(Registries.BIOME, new ResourceLocation("c:underground")); + return TagKey.create(Registries.BIOME, ResourceLocation.parse("c:underground")); } @Override @@ -80,7 +76,6 @@ public CreativeModeTab registerItemTab(ItemStack icon, @NotNull Component title, @Override public void registerBiomeModifier(float minTemp, float maxTemp, TagKey allowed, TagKey denied, GenerationStep.Decoration step, ResourceKey modifier) { - // biome modifiers are loaded via file in forge/neoforge } }