Update to 1.18

percivalalb · Nov 30, 2021 · a12ba55 · a12ba55
1 parent 755149d
commit a12ba55
Show file tree

Hide file tree

Showing 68 changed files with 234 additions and 238 deletions.
diff --git a/build.gradle b/build.gradle
@@ -48,7 +48,7 @@ configurations {
     apiRuntimeOnly.extendsFrom(runtimeOnly)
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 repositories {
     maven {
@@ -100,8 +100,8 @@ minecraft {
 dependencies {
     minecraft "net.minecraftforge:forge:${project.forge_version}"
 
-    compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
+    //compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
+    //runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")

diff --git a/gradle.properties b/gradle.properties
@@ -3,17 +3,17 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-forge_version=1.17.1-37.0.103
+forge_version=1.18-38.0.0
 mcp_channel=official
-mcp_mappings=1.17.1
+mcp_mappings=1.18
 
-jei_version=1.17.1:8.1.0.31
+jei_version=1.18:????????
 
-target_mc_version=1.17.1
+target_mc_version=1.18
 additional_mc_versions=
 
-fml_version_range=[37,)
-forge_version_range=[37.0.78,)
-minecraft_version_range=[1.17.1, 1.18)
+fml_version_range=[38,)
+forge_version_range=[38.0.0,)
+minecraft_version_range=[1.18, 1.19)
 
 curseforge_project_id=271050
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/api/java/doggytalents/api/feature/IDog.java b/src/api/java/doggytalents/api/feature/IDog.java
@@ -22,24 +22,24 @@ public interface IDog {
 
     public EnumMode getMode();
 
-    public DogLevel getLevel();
+    public DogLevel getDogLevel();
     public void increaseLevel(DogLevel.Type typeIn);
 
     /**
      * Convenience method to get the level of a talent
      * @param talentGetter A getter function, typically a {@link RegistryObject<Talent>} would be provided
      * @return The level of the talent
      */
-    default int getLevel(Supplier<? extends Talent> talentGetter) {
-        return this.getLevel(talentGetter.get());
+    default int getDogLevel(Supplier<? extends Talent> talentGetter) {
+        return this.getDogLevel(talentGetter.get());
     }
 
     /**
      * Returns the level of the given talent
      * @param talentIn The {@link Talent}
      * @return The level of the talent
      */
-    public int getLevel(Talent talentIn);
+    public int getDogLevel(Talent talentIn);
 
     default Optional<TalentInstance> getTalent(Supplier<? extends Talent> talentGetter) {
         return this.getTalent(talentGetter.get());

diff --git a/src/main/java/doggytalents/DoggyAccessories.java b/src/main/java/doggytalents/DoggyAccessories.java
@@ -7,7 +7,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 
 import java.util.function.Supplier;

diff --git a/src/main/java/doggytalents/DoggyAccessoryTypes.java b/src/main/java/doggytalents/DoggyAccessoryTypes.java
@@ -2,7 +2,7 @@
 
 import doggytalents.api.registry.AccessoryType;
 import doggytalents.common.lib.Constants;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 
 import java.util.function.Supplier;

diff --git a/src/main/java/doggytalents/DoggyAttributes.java b/src/main/java/doggytalents/DoggyAttributes.java
@@ -3,7 +3,7 @@
 import doggytalents.common.lib.Constants;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.RangedAttribute;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggyBedMaterials.java b/src/main/java/doggytalents/DoggyBedMaterials.java
@@ -7,7 +7,7 @@
 import doggytalents.common.lib.Constants;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 
 import java.util.function.Supplier;

diff --git a/src/main/java/doggytalents/DoggyBlocks.java b/src/main/java/doggytalents/DoggyBlocks.java
@@ -11,7 +11,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggyContainerTypes.java b/src/main/java/doggytalents/DoggyContainerTypes.java
@@ -11,9 +11,9 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.SimpleContainerData;
-import net.minecraftforge.common.extensions.IForgeContainerType;
-import net.minecraftforge.fmllegacy.RegistryObject;
-import net.minecraftforge.fmllegacy.network.IContainerFactory;
+import net.minecraftforge.common.extensions.IForgeMenuType;
+import net.minecraftforge.network.IContainerFactory;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 
@@ -52,7 +52,7 @@ public class DoggyContainerTypes {
     });
 
     private static <X extends AbstractContainerMenu, T extends MenuType<X>> RegistryObject<MenuType<X>> register(final String name, final IContainerFactory<X> factory) {
-        return register(name, () -> IForgeContainerType.create(factory));
+        return register(name, () -> IForgeMenuType.create(factory));
     }
 
     private static <T extends MenuType<?>> RegistryObject<T> register(final String name, final Supplier<T> sup) {

diff --git a/src/main/java/doggytalents/DoggyEntityTypes.java b/src/main/java/doggytalents/DoggyEntityTypes.java
@@ -10,7 +10,7 @@
 import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggyItems.java b/src/main/java/doggytalents/DoggyItems.java
@@ -11,7 +11,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggyRecipeSerializers.java b/src/main/java/doggytalents/DoggyRecipeSerializers.java
@@ -6,7 +6,7 @@
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggySerializers.java b/src/main/java/doggytalents/DoggySerializers.java
@@ -3,7 +3,7 @@
 import doggytalents.common.entity.serializers.*;
 import doggytalents.common.lib.Constants;
 import net.minecraft.network.syncher.EntityDataSerializer;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DataSerializerEntry;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;

diff --git a/src/main/java/doggytalents/DoggySounds.java b/src/main/java/doggytalents/DoggySounds.java
@@ -4,7 +4,7 @@
 import doggytalents.common.util.Util;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/DoggyTalents.java b/src/main/java/doggytalents/DoggyTalents.java
@@ -4,7 +4,7 @@
 import doggytalents.api.registry.TalentInstance;
 import doggytalents.common.lib.Constants;
 import doggytalents.common.talent.*;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 
 import java.util.function.BiFunction;

diff --git a/src/main/java/doggytalents/DoggyTalents2.java b/src/main/java/doggytalents/DoggyTalents2.java
@@ -32,9 +32,9 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fmllegacy.network.NetworkRegistry;
-import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -118,7 +118,7 @@ public void commonSetup(final FMLCommonSetupEvent event) {
         DogEntity.initDataParameters();
     }
 
-    public void serverStarting(final FMLServerStartingEvent event) {
+    public void serverStarting(final ServerStartingEvent event) {
 
     }
 

diff --git a/src/main/java/doggytalents/DoggyTileEntityTypes.java b/src/main/java/doggytalents/DoggyTileEntityTypes.java
@@ -6,7 +6,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 

diff --git a/src/main/java/doggytalents/client/DogTextureManager.java b/src/main/java/doggytalents/client/DogTextureManager.java
@@ -22,7 +22,7 @@
 import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraftforge.fmllegacy.network.PacketDistributor;
+import net.minecraftforge.network.PacketDistributor;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 

diff --git a/src/main/java/doggytalents/client/block/model/DogBedModel.java b/src/main/java/doggytalents/client/block/model/DogBedModel.java
@@ -24,7 +24,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ForgeModelBakery;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.registries.IRegistryDelegate;
@@ -41,13 +41,13 @@ public class DogBedModel implements BakedModel {
     public static DogBedItemOverride ITEM_OVERIDE = new DogBedItemOverride();
     private static final ResourceLocation MISSING_TEXTURE = new ResourceLocation("missingno");
 
-    private ModelLoader modelLoader;
+    private ForgeModelBakery modelLoader;
     private BlockModel model;
     private BakedModel bakedModel;
 
     private final Map<Triple<IRegistryDelegate<ICasingMaterial>, IRegistryDelegate<IBeddingMaterial>, Direction>, BakedModel> cache = Maps.newHashMap();
 
-    public DogBedModel(ModelLoader modelLoader, BlockModel model, BakedModel bakedModel) {
+    public DogBedModel(ForgeModelBakery modelLoader, BlockModel model, BakedModel bakedModel) {
         this.modelLoader = modelLoader;
         this.model = model;
         this.bakedModel = bakedModel;
@@ -121,7 +121,7 @@ public BakedModel bakeModelVariant(@Nullable IRegistryDelegate<ICasingMaterial>
         newModel.textureMap.put("casing", casingTexture);
         newModel.textureMap.put("particle", casingTexture);
 
-        return newModel.bake(this.modelLoader, newModel, ModelLoader.defaultTextureGetter(), getModelRotation(facing), createResourceVariant(casingResource, beddingResource, facing), true);
+        return newModel.bake(this.modelLoader, newModel, ForgeModelBakery.defaultTextureGetter(), getModelRotation(facing), createResourceVariant(casingResource, beddingResource, facing), true);
     }
 
     private ResourceLocation createResourceVariant(@Nonnull IRegistryDelegate<ICasingMaterial> casingResource, @Nonnull IRegistryDelegate<IBeddingMaterial> beddingResource, @Nonnull Direction facing) {

diff --git a/src/main/java/doggytalents/client/entity/render/world/BedFinderRenderer.java b/src/main/java/doggytalents/client/entity/render/world/BedFinderRenderer.java
@@ -13,13 +13,13 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.client.event.RenderLevelLastEvent;
 
 import java.util.Optional;
 
 public class BedFinderRenderer {
 
-    public static void onWorldRenderLast(RenderWorldLastEvent event) {
+    public static void onWorldRenderLast(RenderLevelLastEvent event) {
         Player player = Minecraft.getInstance().player;
         for (Entity passenger : player.getPassengers()) {
             if (passenger instanceof DogEntity) {
@@ -28,10 +28,10 @@ public static void onWorldRenderLast(RenderWorldLastEvent event) {
 
                 if (bedPosOpt.isPresent()) {
                     BlockPos bedPos = bedPosOpt.get();
-                    int level = dog.getLevel(DoggyTalents.BED_FINDER);
+                    int level = dog.getDogLevel(DoggyTalents.BED_FINDER);
                     double distance = (level * 200D) - Math.sqrt(bedPos.distSqr(dog.blockPosition()));
                     if (level == 5 || distance >= 0.0D) {
-                        PoseStack stack = event.getMatrixStack();
+                        PoseStack stack = event.getPoseStack();
 
                         AABB boundingBox = new AABB(bedPos).inflate(0.5D);
                         drawSelectionBox(stack, boundingBox);