keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Update to 1.16.1 and fix a couple more patch problems 

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
cpw 2020-06-25 18:28:48 -04:00
parent 648d53ffe1
commit 4700973dff
No known key found for this signature in database
GPG Key ID: 8EB3DF749553B1B7
7 changed files with 191 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -65,8 +65,8 @@ ext {
}
MAPPING_CHANNEL = 'snapshot'
MAPPING_VERSION = '20200514-1.16'
MC_VERSION = '1.16'
MCP_VERSION = '20200623.201412'
MC_VERSION = '1.16.1'
MCP_VERSION = '20200625.134731'
}
project(':mcp') {

19
src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java
View File

@ -1,3 +1,22 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2019.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.fml.loading.moddiscovery;
import com.electronwill.nightconfig.core.UnmodifiableConfig;

4
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
View File

@ -1,6 +1,6 @@
/*
* Minecraft Forge
* func_240521_a_right (c) 2016-2019.
* Copyright (c) 2016-2019.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -12,7 +12,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a func_240521_a_ of the GNU Lesser General Public
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

19
src/main/java/net/minecraftforge/common/data/ForgeLootTableProvider.java
View File

@ -1,3 +1,22 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2019.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.common.data;
import com.mojang.datafixers.util.Pair;

19
src/main/java/net/minecraftforge/common/extensions/IAbstractRailBlock.java
View File

@ -1,3 +1,22 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2019.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.common.extensions;
import net.minecraft.block.AbstractBlock;

20
src/test/java/net/minecraftforge/debug/DataGeneratorTest.java
View File

@ -195,17 +195,17 @@ public class DataGeneratorTest
.addOptionalTag(new ResourceLocation("forge", "storage_blocks/ruby"));
// Hopefully sorting issues
getBuilder(new BlockTags.Wrapper(new ResourceLocation(MODID, "thing/one")))
.add(Blocks.COBBLESTONE);
getBuilder(new BlockTags.Wrapper(new ResourceLocation(MODID, "thing/two")))
.add(Blocks.DIORITE);
getBuilder(new BlockTags.Wrapper(new ResourceLocation(MODID, "thing/three")))
.add(Blocks.ANDESITE);
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/one").toString()))
.func_240532_a_(Blocks.COBBLESTONE);
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/two").toString()))
.func_240532_a_(Blocks.DIORITE);
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/three").toString()))
.func_240532_a_(Blocks.ANDESITE);
getBuilder(new BlockTags.Wrapper(new ResourceLocation(MODID, "things")))
.add(Blocks.COBBLESTONE)
.add(Blocks.DIORITE)
.add(Blocks.ANDESITE);
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "things").toString()))
.func_240532_a_(Blocks.COBBLESTONE)
.func_240532_a_(Blocks.DIORITE)
.func_240532_a_(Blocks.ANDESITE);
}
}

19
src/test/java/net/minecraftforge/debug/DeferredRegistryTest.java
View File

@ -1,3 +1,22 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2019.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.debug;
import java.util.function.Supplier;