-
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Now supports Minecarts Attempts to save entities by cancelling setPortal
- Loading branch information
Showing
11 changed files
with
126 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 0 additions & 100 deletions
100
...ain/java/io/github/lxgaming/sledgehammer/integrations/SpongeIntegration_ItemTeleport.java
This file was deleted.
Oops, something went wrong.
85 changes: 85 additions & 0 deletions
85
src/main/java/io/github/lxgaming/sledgehammer/mixin/core/entity/MixinEntity_Teleport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright 2018 Alex Thomson | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.github.lxgaming.sledgehammer.mixin.core.entity; | ||
|
|
||
| import io.github.lxgaming.sledgehammer.Sledgehammer; | ||
| import io.github.lxgaming.sledgehammer.configuration.Config; | ||
| import io.github.lxgaming.sledgehammer.configuration.category.MessageCategory; | ||
| import io.github.lxgaming.sledgehammer.configuration.category.MixinCategory; | ||
| import io.github.lxgaming.sledgehammer.util.Toolbox; | ||
| import net.minecraft.entity.Entity; | ||
| import net.minecraftforge.common.util.ITeleporter; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.spongepowered.api.Sponge; | ||
| import org.spongepowered.api.entity.Item; | ||
| import org.spongepowered.api.entity.vehicle.minecart.Minecart; | ||
| import org.spongepowered.api.text.Text; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
| import org.spongepowered.common.interfaces.entity.IMixinEntity; | ||
|
|
||
| @Mixin(value = Entity.class, priority = 1337) | ||
| public abstract class MixinEntity_Teleport { | ||
|
|
||
| @Inject(method = "setPortal", at = @At(value = "HEAD"), cancellable = true) | ||
| private void onSetPortal(CallbackInfo callbackInfo) { | ||
| if (shouldRemove((IMixinEntity) this)) { | ||
| callbackInfo.cancel(); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "changeDimension(I)Lnet/minecraft/entity/Entity;", at = @At(value = "HEAD")) | ||
| private void onChangeDimension(int dimension, CallbackInfoReturnable<Entity> callbackInfoReturnable) { | ||
| IMixinEntity mixinEntity = (IMixinEntity) this; | ||
| if (shouldRemove(mixinEntity)) { | ||
| remove(mixinEntity); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "changeDimension(ILnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;", at = @At(value = "HEAD"), remap = false) | ||
| private void onChangeDimension(int dimension, ITeleporter teleporter, CallbackInfoReturnable<Entity> callbackInfoReturnable) { | ||
| IMixinEntity mixinEntity = (IMixinEntity) this; | ||
| if (shouldRemove(mixinEntity)) { | ||
| remove(mixinEntity); | ||
| } | ||
| } | ||
|
|
||
| private void remove(IMixinEntity mixinEntity) { | ||
| mixinEntity.remove(); | ||
|
|
||
| Sledgehammer.getInstance().debugMessage("Entity {} removed", Toolbox.getRootType(mixinEntity).getId()); | ||
| Sledgehammer.getInstance().getConfig().map(Config::getMessageCategory).map(MessageCategory::getItemTeleport).filter(StringUtils::isNotBlank).ifPresent(message -> { | ||
| mixinEntity.getCreator().flatMap(Sponge.getServer()::getPlayer).ifPresent(player -> { | ||
| player.sendMessage(Text.of(Toolbox.getTextPrefix(), Toolbox.convertColor(message.replace("[ID]", Toolbox.getRootType(mixinEntity).getId())))); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| private boolean shouldRemove(IMixinEntity mixinEntity) { | ||
| if (!(mixinEntity instanceof Item || mixinEntity instanceof Minecart) || mixinEntity.isRemoved()) { | ||
| return false; | ||
| } | ||
|
|
||
| return Sledgehammer.getInstance().getConfig() | ||
| .map(Config::getMixinCategory) | ||
| .map(MixinCategory::getItemTeleportWhitelist) | ||
| .map(list -> !list.contains(Toolbox.getRootType(mixinEntity).getId())).orElse(false); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters