Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit f7fc388

Browse files
committed
Revert "Implement AnimalTameEvent (#152)"
This reverts commit 7376574
1 parent 7376574 commit f7fc388

File tree

7 files changed

+1
-232
lines changed

7 files changed

+1
-232
lines changed

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/AnimalTameEvent.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import net.minecraftforge.common.extensions.IForgeItem;
2727
import net.minecraftforge.event.entity.EntityEvent;
2828
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
29-
import net.minecraftforge.event.entity.living.AnimalTameEvent;
3029
import net.minecraftforge.event.entity.living.LivingAttackEvent;
3130
import net.minecraftforge.event.entity.living.LivingDamageEvent;
3231
import net.minecraftforge.event.entity.living.LivingDeathEvent;
@@ -55,7 +54,6 @@
5554
import net.minecraft.entity.SpawnType;
5655
import net.minecraft.entity.damage.DamageSource;
5756
import net.minecraft.entity.mob.MobEntity;
58-
import net.minecraft.entity.passive.AnimalEntity;
5957
import net.minecraft.entity.player.PlayerEntity;
6058
import net.minecraft.item.ItemStack;
6159
import net.minecraft.text.Text;
@@ -198,10 +196,6 @@ public static void onItemTooltip(ItemStack itemStack, PlayerEntity entityPlayer,
198196
MinecraftForge.EVENT_BUS.post(new ItemTooltipEvent(itemStack, entityPlayer, list, flags));
199197
}
200198

201-
public static boolean onAnimalTame(AnimalEntity animal, PlayerEntity tamer) {
202-
return MinecraftForge.EVENT_BUS.post(new AnimalTameEvent(animal, tamer));
203-
}
204-
205199
@Override
206200
public void onInitialize() {
207201
UseItemCallback.EVENT.register((player, world, hand) -> {

patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinHorseBondWithPlayerGoal.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinOcelotEntity.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinTameableEntitySubclass.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,19 @@
77
"MixinEntityTrackerEntry",
88
"MixinEntityType",
99
"MixinExperienceOrbEntity",
10-
"MixinHorseBondWithPlayerGoal",
1110
"MixinLivingEntity",
1211
"MixinMobEntity",
1312
"MixinMobSpawnerLogic",
14-
"MixinOcelotEntity",
1513
"MixinPlayerEntity",
1614
"MixinPlayerManager",
1715
"MixinServerPlayerEntity",
1816
"MixinServerWorld",
1917
"MixinSpawnHelper",
20-
"MixinTameableEntitySubclass",
2118
"MixinWorldChunk"
2219
],
2320
"client": [
24-
"MixinClientPlayerEntity",
2521
"MixinClientWorld",
22+
"MixinClientPlayerEntity",
2623
"MixinItemStack",
2724
"MixinOtherClientPlayerEntity"
2825
],

patchwork-god-classes/src/main/java/net/minecraftforge/event/ForgeEventFactory.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import net.minecraft.entity.SpawnType;
2929
import net.minecraft.entity.mob.MobEntity;
30-
import net.minecraft.entity.passive.AnimalEntity;
3130
import net.minecraft.entity.player.PlayerEntity;
3231
import net.minecraft.loot.LootManager;
3332
import net.minecraft.loot.LootTable;
@@ -83,8 +82,4 @@ public static LootTable loadLootTable(Identifier name, LootTable table, LootMana
8382
public static float fireBlockHarvesting(DefaultedList<ItemStack> drops, World world, BlockPos pos, BlockState state, int fortune, float dropChance, boolean silkTouch, PlayerEntity player) {
8483
return WorldEvents.fireBlockHarvesting(drops, world, pos, state, fortune, dropChance, silkTouch, player);
8584
}
86-
87-
public static boolean onAnimalTame(AnimalEntity animal, PlayerEntity tamer) {
88-
return EntityEvents.onAnimalTame(animal, tamer);
89-
}
9085
}

0 commit comments

Comments
 (0)