mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Regenerate patches with relative headers. This should lower conflicts in future PRs.
Convert Forge to use Official mappings. Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive. It is clear that their intent is to allow us to use their names for developing mods like this. See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
This commit is contained in:
1 parent
802298d99d
commit
a95b968c13
832 files changed
+4464
-4373
No files matched your search
@@ -58,7 +58,7 @@ public class ContainerTypeTest
|
||||
|
||||
protected TestContainer(int windowId, PlayerInventory playerInv, PacketBuffer extraData)
|
||||
{
|
||||
this(windowId, new Inventory(9), extraData.readString(128));
|
||||
this(windowId, new Inventory(9), extraData.readUtf(128));
|
||||
}
|
||||
|
||||
public TestContainer(int windowId, Inventory inv, String text)
|
||||
@@ -72,7 +72,7 @@ public class ContainerTypeTest
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(PlayerEntity playerIn)
|
||||
public boolean stillValid(PlayerEntity playerIn)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -86,9 +86,9 @@ public class ContainerTypeTest
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(MatrixStack mStack, float partialTicks, int mouseX, int mouseY)
|
||||
protected void renderBg(MatrixStack mStack, float partialTicks, int mouseX, int mouseY)
|
||||
{
|
||||
drawString(mStack, this.font, getContainer().text, mouseX, mouseY, -1);
|
||||
drawString(mStack, this.font, getMenu().text, mouseX, mouseY, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,12 +106,12 @@ public class ContainerTypeTest
|
||||
|
||||
private void setup(FMLClientSetupEvent event)
|
||||
{
|
||||
ScreenManager.registerFactory(TYPE, TestGui::new);
|
||||
ScreenManager.register(TYPE, TestGui::new);
|
||||
}
|
||||
|
||||
private void onRightClick(PlayerInteractEvent.RightClickBlock event)
|
||||
{
|
||||
if (!event.getWorld().isRemote && event.getHand() == Hand.MAIN_HAND)
|
||||
if (!event.getWorld().isClientSide && event.getHand() == Hand.MAIN_HAND)
|
||||
{
|
||||
if (event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.SPONGE)
|
||||
{
|
||||
@@ -122,9 +122,9 @@ public class ContainerTypeTest
|
||||
public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_)
|
||||
{
|
||||
Inventory inv = new Inventory(9);
|
||||
for (int i = 0; i < inv.getSizeInventory(); i++)
|
||||
for (int i = 0; i < inv.getContainerSize(); i++)
|
||||
{
|
||||
inv.setInventorySlotContents(i, new ItemStack(Items.DIAMOND));
|
||||
inv.setItem(i, new ItemStack(Items.DIAMOND));
|
||||
}
|
||||
return new TestContainer(p_createMenu_1_, inv, text);
|
||||
}
|
||||
@@ -135,7 +135,7 @@ public class ContainerTypeTest
|
||||
return new StringTextComponent("Test");
|
||||
}
|
||||
}, extraData -> {
|
||||
extraData.writeString(text);
|
||||
extraData.writeUtf(text);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,10 +101,10 @@ public class CustomTagTypesTest
|
||||
ItemStack itemStack = event.getItemStack();
|
||||
if (!itemStack.isEmpty())
|
||||
{
|
||||
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.getAllElements().size(), TagCollectionManager.getManager().getItemTags().get(new ResourceLocation(MODID, "optional_test")));
|
||||
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.getValues().size(), TagCollectionManager.getInstance().getItems().getTag(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());
|
||||
if (itemStack.getItem() instanceof PotionItem) logTagsIfPresent(PotionUtils.getPotion(itemStack).getTags());
|
||||
TileEntity tileEntity = event.getWorld().getBlockEntity(event.getPos());
|
||||
if (tileEntity != null) logTagsIfPresent(tileEntity.getType().getTags());
|
||||
}
|
||||
}
|
||||
@@ -119,7 +119,7 @@ public class CustomTagTypesTest
|
||||
|
||||
public static class Custom extends ForgeRegistryEntry<Custom>
|
||||
{
|
||||
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> TagCollectionManager.getManager().getCustomTypeCollection(CUSTOM_REG.get()));
|
||||
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> TagCollectionManager.getInstance().getCustomTypeCollection(CUSTOM_REG.get()));
|
||||
|
||||
public Set<ResourceLocation> getTags()
|
||||
{
|
||||
@@ -140,9 +140,9 @@ public class CustomTagTypesTest
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerTags()
|
||||
protected void addTags()
|
||||
{
|
||||
getOrCreateBuilder(TESTS).addItemEntry(CUSTOM.get());
|
||||
tag(TESTS).add(CUSTOM.get());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -160,9 +160,9 @@ public class CustomTagTypesTest
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerTags()
|
||||
protected void addTags()
|
||||
{
|
||||
getOrCreateBuilder(FIRE).add(Enchantments.FIRE_ASPECT, Enchantments.FLAME);
|
||||
tag(FIRE).add(Enchantments.FIRE_ASPECT, Enchantments.FLAMING_ARROWS);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -180,9 +180,9 @@ public class CustomTagTypesTest
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerTags()
|
||||
protected void addTags()
|
||||
{
|
||||
getOrCreateBuilder(DAMAGE).add(Potions.HARMING, Potions.STRONG_HARMING);
|
||||
tag(DAMAGE).add(Potions.HARMING, Potions.STRONG_HARMING);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -200,9 +200,9 @@ public class CustomTagTypesTest
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerTags()
|
||||
protected void addTags()
|
||||
{
|
||||
getOrCreateBuilder(STORAGE).add(TileEntityType.BARREL, TileEntityType.CHEST, TileEntityType.ENDER_CHEST);
|
||||
tag(STORAGE).add(TileEntityType.BARREL, TileEntityType.CHEST, TileEntityType.ENDER_CHEST);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user