mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +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
@@ -46,20 +46,20 @@ public class PotionEventTest
|
||||
|
||||
private void onSetup(FMLCommonSetupEvent event)
|
||||
{
|
||||
BrewingRecipeRegistry.addRecipe(Ingredient.fromItems(Items.ICE), Ingredient.fromItems(Items.LAVA_BUCKET), new ItemStack(Items.OBSIDIAN));
|
||||
BrewingRecipeRegistry.addRecipe(Ingredient.of(Items.ICE), Ingredient.of(Items.LAVA_BUCKET), new ItemStack(Items.OBSIDIAN));
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onPotionAdded(PotionEvent.PotionAddedEvent event)
|
||||
{
|
||||
if (!event.getEntity().getEntityWorld().isRemote)
|
||||
if (!event.getEntity().getCommandSenderWorld().isClientSide)
|
||||
LOGGER.info("{} has a new PotionEffect {}, the old one was {}", event.getEntityLiving(), event.getPotionEffect(), event.getOldPotionEffect());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void isPotionApplicable(PotionEvent.PotionApplicableEvent event)
|
||||
{
|
||||
if (!event.getEntity().getEntityWorld().isRemote)
|
||||
if (!event.getEntity().getCommandSenderWorld().isClientSide)
|
||||
{
|
||||
event.setResult(Result.ALLOW);
|
||||
LOGGER.info("Allowed Potion {} for Entity {}", event.getPotionEffect(), event.getEntityLiving());
|
||||
@@ -69,14 +69,14 @@ public class PotionEventTest
|
||||
@SubscribeEvent
|
||||
public static void onPotionRemove(PotionEvent.PotionRemoveEvent event)
|
||||
{
|
||||
if (!event.getEntity().getEntityWorld().isRemote)
|
||||
if (!event.getEntity().getCommandSenderWorld().isClientSide)
|
||||
LOGGER.info("Effect {} got Removed from {}", event.getPotionEffect(), event.getEntityLiving());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onPotionExpiry(PotionEvent.PotionExpiryEvent event)
|
||||
{
|
||||
if (!event.getEntity().getEntityWorld().isRemote)
|
||||
if (!event.getEntity().getCommandSenderWorld().isClientSide)
|
||||
LOGGER.info("Effect {} expired from {}", event.getPotionEffect(), event.getEntityLiving());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user