1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-13 19:50:31 +00:00

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.
This commit is contained in:
SquidDev 2020-09-12 10:45:59 +01:00
parent d0a973fa46
commit 8b4a01df27
4 changed files with 8 additions and 8 deletions

View File

@ -2,6 +2,6 @@
mod_version=1.92.0 mod_version=1.92.0
# Minecraft properties (update mods.toml when changing) # Minecraft properties (update mods.toml when changing)
mc_version=1.16.2 mc_version=1.16.3
forge_version=33.0.37 forge_version=34.0.1
mappings_version=20200723-1.16.1 mappings_version=20200723-1.16.1

View File

@ -7,7 +7,6 @@
package dan200.computercraft.data; package dan200.computercraft.data;
import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon; import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
import net.minecraft.data.BlockTagsProvider;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@ -24,6 +23,6 @@ public class Generators
DataGenerator generator = event.getGenerator(); DataGenerator generator = event.getGenerator();
generator.addProvider( new Recipes( generator ) ); generator.addProvider( new Recipes( generator ) );
generator.addProvider( new LootTables( generator ) ); generator.addProvider( new LootTables( generator ) );
generator.addProvider( new Tags( generator, new BlockTagsProvider( generator ) ) ); generator.addProvider( new Tags( generator, event.getExistingFileHelper() ) );
} }
} }

View File

@ -15,6 +15,7 @@ import net.minecraft.item.Item;
import net.minecraft.tags.ITag; import net.minecraft.tags.ITag;
import net.minecraft.tags.ItemTags; import net.minecraft.tags.ItemTags;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.data.ExistingFileHelper;
import static dan200.computercraft.data.Tags.CCTags.*; import static dan200.computercraft.data.Tags.CCTags.*;
@ -30,9 +31,9 @@ public class Tags extends ItemTagsProvider
public static final ITag.INamedTag<Item> MONITOR = item( "monitor" ); public static final ITag.INamedTag<Item> 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 @Override

View File

@ -1,5 +1,5 @@
modLoader="javafml" modLoader="javafml"
loaderVersion="[33,34)" loaderVersion="[34,35)"
issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues" issueTrackerURL="https://github.com/SquidDev-CC/CC-Tweaked/issues"
displayURL="https://github.com/SquidDev-CC/CC-Tweaked" 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]] [[dependencies.computercraft]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[33.0.20,34)" versionRange="[34.0.1,35)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"