Update forge mappings to 20201028-1.16.3 (#7435)

This commit is contained in:
David Quintana authored and GitHub committed 2020-10-29 01:11:57 +01:00
1 parent 6e0e67b14d
commit 53eedb0f10
93 files changed
+598 -588

No files matched your search

@@ -211,24 +211,24 @@ public class DataGeneratorTest
@Override
protected void registerTags()
{
func_240522_a_(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "test").toString()))
.func_240532_a_(Blocks.DIAMOND_BLOCK)
.func_240531_a_(BlockTags.STONE_BRICKS)
getOrCreateBuilder(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "test").toString()))
.addItemEntry(Blocks.DIAMOND_BLOCK)
.addTag(BlockTags.STONE_BRICKS)
.addOptional(new ResourceLocation("chisel", "marble/raw"))
.addOptionalTag(new ResourceLocation("forge", "storage_blocks/ruby"));
// Hopefully sorting issues
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);
getOrCreateBuilder(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/one").toString()))
.addItemEntry(Blocks.COBBLESTONE);
getOrCreateBuilder(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/two").toString()))
.addItemEntry(Blocks.DIORITE);
getOrCreateBuilder(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "thing/three").toString()))
.addItemEntry(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);
getOrCreateBuilder(BlockTags.makeWrapperTag(new ResourceLocation(MODID, "things").toString()))
.addItemEntry(Blocks.COBBLESTONE)
.addItemEntry(Blocks.DIORITE)
.addItemEntry(Blocks.ANDESITE);
}
}
@@ -422,7 +422,7 @@ public class DataGeneratorTest
models().getBuilder("cube")
.parent(block)
.element()
.allFaces((dir, face) -> face.texture("#" + dir.func_176610_l()).cullface(dir));
.allFaces((dir, face) -> face.texture("#" + dir.getString()).cullface(dir));
ModelFile furnace = models().orientable("furnace", mcLoc("block/furnace_side"), mcLoc("block/furnace_front"), mcLoc("block/furnace_top"));
ModelFile furnaceLit = models().orientable("furnace_on", mcLoc("block/furnace_side"), mcLoc("block/furnace_front_on"), mcLoc("block/furnace_top"));
@@ -81,7 +81,7 @@ public class ScaffoldingTest
@Override
protected void registerStatesAndModels()
{
this.getVariantBuilder(SCAFFOLDING_METHOD_TEST.get()).forAllStatesExcept((state) -> ConfiguredModel.builder().modelFile(state.get(ScaffoldingBlock.field_220120_c) ? new ModelFile.ExistingModelFile(new ResourceLocation("block/scaffolding_unstable"), this.models().existingFileHelper) : new ModelFile.ExistingModelFile(new ResourceLocation("block/scaffolding_stable"), this.models().existingFileHelper)).build(), ScaffoldingBlock.field_220118_a, ScaffoldingBlock.WATERLOGGED);
this.getVariantBuilder(SCAFFOLDING_METHOD_TEST.get()).forAllStatesExcept((state) -> ConfiguredModel.builder().modelFile(state.get(ScaffoldingBlock.BOTTOM) ? new ModelFile.ExistingModelFile(new ResourceLocation("block/scaffolding_unstable"), this.models().existingFileHelper) : new ModelFile.ExistingModelFile(new ResourceLocation("block/scaffolding_stable"), this.models().existingFileHelper)).build(), ScaffoldingBlock.DISTANCE, ScaffoldingBlock.WATERLOGGED);
}
}
@@ -128,8 +128,8 @@ public class TRSRTransformerTest {
}
@Override
public boolean func_230044_c_() {
return base.func_230044_c_();
public boolean isSideLit() {
return base.isSideLit();
}
@Override
@@ -48,13 +48,13 @@ public class NameplateRenderingEventTest
if(event.getEntity() instanceof CowEntity)
{
event.setContent(new StringTextComponent("Evil Cow").func_240699_a_(TextFormatting.RED));
event.setContent(new StringTextComponent("Evil Cow").mergeStyle(TextFormatting.RED));
event.setResult(Event.Result.ALLOW);
}
if(event.getEntity() instanceof PlayerEntity)
{
event.setContent(event.getEntity().getDisplayName().func_230532_e_().func_240701_a_(TextFormatting.GOLD));
event.setContent(event.getEntity().getDisplayName().deepCopy().mergeStyle(TextFormatting.GOLD));
}
}
}
@@ -101,11 +101,11 @@ public class GravityAttributeTest
for(LivingEntity liv : list)
{
ModifiableAttributeInstance grav = liv.getAttribute(ForgeMod.ENTITY_GRAVITY.get());
boolean inPlains = liv.world.getBiome(liv.func_233580_cy_()).getCategory() == Category.PLAINS;
boolean inPlains = liv.world.getBiome(liv.getPosition()).getCategory() == Category.PLAINS;
if (inPlains && !grav.hasModifier(REDUCED_GRAVITY))
{
logger.info("Granted low gravity to Entity: {}", liv);
grav.func_233767_b_(REDUCED_GRAVITY);
grav.applyNonPersistentModifier(REDUCED_GRAVITY);
}
else if (!inPlains && grav.hasModifier(REDUCED_GRAVITY))
{
@@ -86,9 +86,9 @@ public class ContainerTypeTest
}
@Override
protected void func_230450_a_(MatrixStack mStack, float partialTicks, int mouseX, int mouseY)
protected void drawGuiContainerBackgroundLayer(MatrixStack mStack, float partialTicks, int mouseX, int mouseY)
{
func_238476_c_(mStack, this.field_230712_o_, getContainer().text, mouseX, mouseY, -1);
drawString(mStack, this.font, getContainer().text, mouseX, mouseY, -1);
}
}
@@ -101,7 +101,7 @@ public class CustomTagTypesTest
ItemStack itemStack = event.getItemStack();
if (!itemStack.isEmpty())
{
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.func_230236_b_().size(), TagCollectionManager.func_242178_a().func_241836_b().get(new ResourceLocation(MODID, "optional_test")));
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.getAllElements().size(), TagCollectionManager.getManager().getItemTags().get(new ResourceLocation(MODID, "optional_test")));
EnchantmentHelper.getEnchantments(itemStack).forEach((enchantment, level) -> logTagsIfPresent(enchantment.getTags()));
if (itemStack.getItem() instanceof PotionItem) logTagsIfPresent(PotionUtils.getPotionFromItem(itemStack).getTags());
TileEntity tileEntity = event.getWorld().getTileEntity(event.getPos());
@@ -119,7 +119,7 @@ public class CustomTagTypesTest
public static class Custom extends ForgeRegistryEntry<Custom>
{
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> TagCollectionManager.func_242178_a().getCustomTypeCollection(CUSTOM_REG.get()));
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> TagCollectionManager.getManager().getCustomTypeCollection(CUSTOM_REG.get()));
public Set<ResourceLocation> getTags()
{
@@ -128,7 +128,7 @@ public class CustomTagTypesTest
public boolean isIn(ITag<Custom> tag)
{
return tag.func_230235_a_(this);
return tag.contains(this);
}
}
@@ -142,7 +142,7 @@ public class CustomTagTypesTest
@Override
protected void registerTags()
{
func_240522_a_(TESTS).func_240532_a_(CUSTOM.get());
getOrCreateBuilder(TESTS).addItemEntry(CUSTOM.get());
}
@Override
@@ -162,7 +162,7 @@ public class CustomTagTypesTest
@Override
protected void registerTags()
{
func_240522_a_(FIRE).func_240534_a_(Enchantments.FIRE_ASPECT, Enchantments.FLAME);
getOrCreateBuilder(FIRE).add(Enchantments.FIRE_ASPECT, Enchantments.FLAME);
}
@Override
@@ -182,7 +182,7 @@ public class CustomTagTypesTest
@Override
protected void registerTags()
{
func_240522_a_(DAMAGE).func_240534_a_(Potions.HARMING, Potions.STRONG_HARMING);
getOrCreateBuilder(DAMAGE).add(Potions.HARMING, Potions.STRONG_HARMING);
}
@Override
@@ -202,7 +202,7 @@ public class CustomTagTypesTest
@Override
protected void registerTags()
{
func_240522_a_(STORAGE).func_240534_a_(TileEntityType.BARREL, TileEntityType.CHEST, TileEntityType.ENDER_CHEST);
getOrCreateBuilder(STORAGE).add(TileEntityType.BARREL, TileEntityType.CHEST, TileEntityType.ENDER_CHEST);
}
@Override
@@ -77,6 +77,6 @@ public class ChunkWatchEventTest
@Nullable
private static ResourceLocation getDimensionName(World w)
{
return w.func_234923_W_().func_240901_a_();
return w.getDimensionKey().getLocation();
}
}
@@ -44,12 +44,12 @@ public class StructureSpawnListGatherEventTest
private void onStructureSpawnListGather(StructureSpawnListGatherEvent event)
{
if (event.getStructure() == Structure.field_236375_k_)
if (event.getStructure() == Structure.STRONGHOLD)
{
event.addEntitySpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITHER_SKELETON, 100, 5, 15));
LOGGER.info("Adding wither skeleton spawns to strong holds");
}
else if (event.getStructure() == Structure.field_236373_i_)
else if (event.getStructure() == Structure.SHIPWRECK)
{
event.setInsideOnly(false);
event.addEntitySpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.GUARDIAN, 100, 5, 15));