Updated to 1.19

progwml6 · Jun 12, 2022 · 8761ab5 · 8761ab5
1 parent b85d869
commit 8761ab5
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,7 +73,8 @@ sourceSets {
 }
 
 minecraft {
- mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
+// mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
+ mappings channel: 'official', version: "${minecraft_version}"
 
  accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -161,9 +162,9 @@ dependencies {
  minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version
 
  // compile against the JEI API but do not include it at runtime
- compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
+// compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
  // at runtime, use the full JEI jar
- runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
+// runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
 }
 
 def modsTomlSpec = copySpec{

diff --git a/gradle.properties b/gradle.properties
@@ -4,21 +4,18 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod Version Information
-mod_version=13.1
+mod_version=14.0
 
 # Minecraft Version Information
-minecraft_base_version=1.18
-minecraft_version=1.18.2
-minecraft_range=[1.18.2,1.19)
+minecraft_base_version=1.19
+minecraft_version=1.19
+minecraft_range=[1.19,)
 
 # Forge Version Information
-forge_version=40.1.16
-loader_range=[39.0,)
-forge_range=[40.1.16,)
+forge_version=41.0.17
+loader_range=[41.0,)
+forge_range=[41.0.17,)
 parchment_version=2022.03.13
 
-# Mappings Information
-mappings_version=1.18.2
-
 # Build dependencies
 jei_version=9.5.3.153
diff --git a/src/main/java/com/progwml6/ironchest/IronChests.java b/src/main/java/com/progwml6/ironchest/IronChests.java
@@ -92,8 +92,7 @@ private void gatherData(GatherDataEvent event) {
  DataGenerator datagenerator = event.getGenerator();
 
  if (event.includeServer()) {
- datagenerator.addProvider(new IronChestsRecipeProvider(datagenerator));
+ datagenerator.addProvider(true, new IronChestsRecipeProvider(datagenerator));
  }
  }
-
 }
diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java b/src/main/java/com/progwml6/ironchest/common/block/regular/AbstractIronChestBlock.java
@@ -9,6 +9,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.stats.Stat;
 import net.minecraft.stats.Stats;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.CompoundContainer;
 import net.minecraft.world.Container;
 import net.minecraft.world.Containers;
@@ -309,7 +310,7 @@ public boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, Bl
  }
 
  @Override
- public void tick(BlockState blockState, ServerLevel serverLevel, BlockPos blockPos, Random random) {
+ public void tick(BlockState blockState, ServerLevel serverLevel, BlockPos blockPos, RandomSource random) {
  BlockEntity blockEntity = serverLevel.getBlockEntity(blockPos);
 
  if (blockEntity instanceof AbstractIronChestBlockEntity) {

diff --git a/...java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java b/...java/com/progwml6/ironchest/common/block/regular/entity/AbstractIronChestBlockEntity.java
@@ -8,7 +8,6 @@
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -80,7 +79,7 @@ public int getContainerSize() {
 
  @Override
  protected Component getDefaultName() {
- return new TranslatableComponent(IronChests.MOD_ID + ".container." + this.chestType.getId() + "_chest");
+ return Component.translatable(IronChests.MOD_ID + ".container." + this.chestType.getId() + "_chest");
  }
 
  @Override

diff --git a/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java b/src/main/java/com/progwml6/ironchest/common/block/regular/entity/DirtChestBlockEntity.java
@@ -9,7 +9,6 @@
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -60,11 +59,11 @@ private static void createBookData() {
  DIRT_CHEST_BOOK.addTagElement("title", StringTag.valueOf(I18n.get("book.ironchest.dirtchest9000.title")));
 
  ListTag pages = new ListTag();
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page1"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page2"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page3"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page4"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page5"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page1"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page2"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page3"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page4"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page5"))));
 
  DIRT_CHEST_BOOK.addTagElement("pages", pages);
 

diff --git a/.../java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java b/.../java/com/progwml6/ironchest/common/block/trapped/entity/TrappedDirtChestBlockEntity.java
@@ -3,14 +3,12 @@
 import com.progwml6.ironchest.common.block.IronChestsBlocks;
 import com.progwml6.ironchest.common.block.IronChestsTypes;
 import com.progwml6.ironchest.common.block.entity.IronChestsBlockEntityTypes;
-import com.progwml6.ironchest.common.block.regular.entity.AbstractIronChestBlockEntity;
 import com.progwml6.ironchest.common.inventory.IronChestMenu;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -61,11 +59,11 @@ private static void createBookData() {
  DIRT_CHEST_BOOK.addTagElement("title", StringTag.valueOf(I18n.get("book.ironchest.dirtchest9000.title")));
 
  ListTag pages = new ListTag();
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page1"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page2"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page3"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page4"))));
- pages.add(StringTag.valueOf(Component.Serializer.toJson(new TranslatableComponent("book.ironchest.dirtchest9000.page5"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page1"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page2"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page3"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page4"))));
+ pages.add(StringTag.valueOf(Component.Serializer.toJson(Component.translatable("book.ironchest.dirtchest9000.page5"))));
 
  DIRT_CHEST_BOOK.addTagElement("pages", pages);
 

diff --git a/src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java b/src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java
@@ -25,6 +25,7 @@
 import net.minecraftforge.common.crafting.ConditionalRecipe;
 import net.minecraftforge.common.crafting.conditions.IConditionBuilder;
 import net.minecraftforge.common.crafting.conditions.TagEmptyCondition;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -277,7 +278,7 @@ private void addUpgradesRecipes(Consumer<FinishedRecipe> consumer) {
  }
 
  protected static ResourceLocation prefix(ItemLike item, String prefix) {
- ResourceLocation loc = Objects.requireNonNull(item.asItem().getRegistryName());
+ ResourceLocation loc = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(item.asItem()));
  return location(prefix + loc.getPath());
  }