From 8b4a01df27ff7f6fa9ffd9c2188c6e3166edd515 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sat, 12 Sep 2020 10:45:59 +0100 Subject: [PATCH] Update to Minecraft 1.16.3 I hope the Fabric folks now realise this is gonna be a race of who can update first :p. Either way, this was a very easy update - only changes were due to unrelated Forge changes. --- gradle.properties | 4 ++-- src/main/java/dan200/computercraft/data/Generators.java | 3 +-- src/main/java/dan200/computercraft/data/Tags.java | 5 +++-- src/main/resources/META-INF/mods.toml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 53c207977..e2da35a53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ mod_version=1.92.0 # Minecraft properties (update mods.toml when changing) -mc_version=1.16.2 -forge_version=33.0.37 +mc_version=1.16.3 +forge_version=34.0.1 mappings_version=20200723-1.16.1 diff --git a/src/main/java/dan200/computercraft/data/Generators.java b/src/main/java/dan200/computercraft/data/Generators.java index 6fb250c19..f95de8086 100644 --- a/src/main/java/dan200/computercraft/data/Generators.java +++ b/src/main/java/dan200/computercraft/data/Generators.java @@ -7,7 +7,6 @@ package dan200.computercraft.data; import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon; -import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -24,6 +23,6 @@ public class Generators DataGenerator generator = event.getGenerator(); generator.addProvider( new Recipes( generator ) ); generator.addProvider( new LootTables( generator ) ); - generator.addProvider( new Tags( generator, new BlockTagsProvider( generator ) ) ); + generator.addProvider( new Tags( generator, event.getExistingFileHelper() ) ); } } diff --git a/src/main/java/dan200/computercraft/data/Tags.java b/src/main/java/dan200/computercraft/data/Tags.java index 587c1b506..1dc5692d2 100644 --- a/src/main/java/dan200/computercraft/data/Tags.java +++ b/src/main/java/dan200/computercraft/data/Tags.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.data.ExistingFileHelper; import static dan200.computercraft.data.Tags.CCTags.*; @@ -30,9 +31,9 @@ public class Tags extends ItemTagsProvider public static final ITag.INamedTag MONITOR = item( "monitor" ); } - public Tags( DataGenerator generator, BlockTagsProvider tags ) + public Tags( DataGenerator generator, ExistingFileHelper helper ) { - super( generator, tags ); + super( generator, new BlockTagsProvider( generator, ComputerCraft.MOD_ID, helper ), ComputerCraft.MOD_ID, helper ); } @Override diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 2c02b708a..200610b0a 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[33,34)" +loaderVersion="[34,35)" issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues" displayURL="https://github.com/SquidDev-CC/CC-Tweaked" @@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a [[dependencies.computercraft]] modId="forge" mandatory=true - versionRange="[33.0.20,34)" + versionRange="[34.0.1,35)" ordering="NONE" side="BOTH"