Initial 1.20.4 work

GirafiStudios · Dec 29, 2023 · 393c19f · 393c19f
1 parent 11a7a02
commit 393c19f
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 28 deletions.
diff --git a/common/src/main/java/com/girafi/waddles/entity/AdeliePenguinEntity.java b/common/src/main/java/com/girafi/waddles/entity/AdeliePenguinEntity.java
@@ -101,11 +101,6 @@ public int getExperienceReward() {
         return 0;
     }
 
-    @Override
-    public boolean canBreatheUnderwater() {
-        return true;
-    }
-
     @Override
     public boolean isFood(@Nonnull ItemStack stack) {
         return !stack.isEmpty() && TEMPTATION_ITEMS.test(stack);

diff --git a/common/src/main/resources/data/minecraft/tags/entity_types/can_breathe_under_water.json b/common/src/main/resources/data/minecraft/tags/entity_types/can_breathe_under_water.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "waddles:adelie_penguin"
+  ]
+}
diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
@@ -1,8 +1,6 @@
 {
     "pack": {
         "description": "Waddles resources",
-        "pack_format": 15,
-        "forge:resource_pack_format": 15,
-        "forge:data_pack_format": 10
+        "pack_format": 22
     }
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'idea'
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.3-SNAPSHOT'
 }
 
 base {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -23,11 +23,11 @@
         ]
     },
     "depends": {
-        "fabricloader": ">=0.14",
+        "fabricloader": ">=0.15.3",
         "fabric-api": "*",
-        "minecraft": "1.20.2",
+        "minecraft": "~1.20.4",
         "java": ">=17",
-        "forgeconfigapiport": ">=9.1.2"
+        "forgeconfigapiport": ">=20.4.0"
     },
     "suggests": {
         "another-mod": "*"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -63,6 +63,12 @@ minecraft {
 
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     compileOnly project(":common")

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 # Project
-version=0.10.0
+version=0.10.1
 group=com.girafi.waddles
 
 # Common
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 mod_name=Waddles
 mod_author=Girafi
 mod_id=waddles
@@ -13,20 +13,20 @@ description=Waddles adds somewhat realistic Adélie penguins that waddle.
 minecraft_version_range=[1.20.2, 1.21)
 
 # Fabric
-fabric_version=0.91.1+1.20.2
-fabric_loader_version=0.15.0
+fabric_version=0.92.0+1.20.4
+fabric_loader_version=0.15.3
 
 # Forge
-forge_version=48.0.49
-forge_loader_version_range=[48,)
-forge_version_range=[48,)
+forge_version=49.0.12
+forge_loader_version_range=[49,)
+forge_version_range=[49,)
 
 # NeoForge
-neoforge_version=20.2.86
+neoforge_version=20.4.62-beta
 neoforge_loader_version_range=[1,)
 
 # Mod Support
-forge_config_api_port=9.1.2
+forge_config_api_port=20.4.0
 
 # Gradle
 org.gradle.jvmargs=-Xmx4G

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'idea'
-    id 'net.neoforged.gradle.userdev' version '7.0.41'
+    id 'net.neoforged.gradle.userdev' version '7.0.57'
     id 'java-library'
 }
 

diff --git a/neoforge/src/main/java/com/girafi/waddles/Waddles.java b/neoforge/src/main/java/com/girafi/waddles/Waddles.java
@@ -14,7 +14,6 @@
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.neoforged.neoforge.common.DeferredSpawnEggItem;
 import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
 import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent;
@@ -29,9 +28,8 @@
 public class Waddles {
     public static final DeferredRegister.Items ITEM_DEFERRED = DeferredRegister.createItems(Constants.MOD_ID);
 
-    public Waddles() {
+    public Waddles(IEventBus eventBus) {
         CommonClass.init();
-        final IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
         eventBus.addListener(this::setupCommon);
         eventBus.addListener(this::setupClient);
 

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -15,14 +15,14 @@ description = '''${description}''' #mandatory (Supports multiline text)
 
 [[dependencies.${mod_id}]] #optional
 modId = "neoforge" #mandatory
-mandatory = true #mandatory
+type = "required"
 versionRange = "${neoforge_loader_version_range}" #mandatory
 ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory
 side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER'
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"

diff --git a/settings.gradle b/settings.gradle
@@ -28,5 +28,5 @@ plugins {
 rootProject.name = 'Waddles'
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 include("neoforge")