diff --git a/build.gradle b/build.gradle index 86c7d57..4452db6 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' ext { - MC_VERSION = '1.15.1' - FORGE_VERSION = '30.0.7' + MC_VERSION = '1.15.2' + FORGE_VERSION = '31.1.0' MY_VERSION = gitVersion() MODID = 'chunknogobyebye' changelog = rootProject.file('build/changelog.txt') @@ -41,8 +41,8 @@ sourceSets { } minecraft { - mappings channel: 'snapshot', version: '20190719-1.14.3' - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + mappings channel: 'snapshot', version: '20200201-1.15.1' + //accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { @@ -73,6 +73,7 @@ minecraft { workingDirectory project.file('run') property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'info' + property 'fml.earlyprogresswindow', 'false' args '--mod', MODID, '--all', '--output', file('src/generated/resources/') diff --git a/src/main/java/net/minecraftforge/lex/cngbb/DataCreator.java b/src/main/java/net/minecraftforge/lex/cngbb/DataCreator.java index b80f97b..a95deab 100644 --- a/src/main/java/net/minecraftforge/lex/cngbb/DataCreator.java +++ b/src/main/java/net/minecraftforge/lex/cngbb/DataCreator.java @@ -94,7 +94,7 @@ private static void save(DirectoryCache cache, Object object, Path target) throw } } - cache.func_208316_a(target, hash); + cache.recordHash(target, hash); } private static class Recipes extends RecipeProvider { @@ -134,13 +134,13 @@ private class Blocks extends BlockLootTables { private Set knownBlocks = new HashSet<>(); protected void addTables() { - this.func_218492_c(LOADER_BLOCK.get()); + this.registerDropSelfLootTable(LOADER_BLOCK.get()); } @Override - public void func_218492_c(Block block) { + public void registerDropSelfLootTable(Block block) { knownBlocks.add(block); - super.func_218492_c(block); + super.registerDropSelfLootTable(block); } @Override diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index 14d49fa..0000000 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,2 +0,0 @@ -public net.minecraft.data.RecipeProvider func_200403_a(Lnet/minecraft/util/IItemProvider;)Lnet/minecraft/advancements/criterion/InventoryChangeTrigger$Instance; # hasItem -public net.minecraft.data.loot.BlockLootTables field_218581_i # Table Map \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 340d0f3..f312b90 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[30,)" +loaderVersion="[31,)" # A URL to refer people to when problems occur with this mod #issueTrackerURL="http://my.issue.tracker/" #optional @@ -17,13 +17,13 @@ loaderVersion="[30,)" [[dependencies.chunknogobyebye]] modId="forge" mandatory=true - versionRange="[30,)" + versionRange="[31,)" ordering="NONE" side="BOTH" [[dependencies.chunknogobyebye]] modId="minecraft" mandatory=true - versionRange="[1.15.1]" + versionRange="[1.15.2]" ordering="NONE" side="BOTH"