forked from Creators-of-Create/Create
-
Notifications
You must be signed in to change notification settings - Fork 200
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make the MinecartController system a little more sane
fixes issues with minecarts
- Loading branch information
Showing
13 changed files
with
64 additions
and
149 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
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
42 changes: 27 additions & 15 deletions
42
src/main/java/com/simibubi/create/foundation/mixin/fabric/AbstractMinecartMixin.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 |
|---|---|---|
| @@ -1,37 +1,49 @@ | ||
| package com.simibubi.create.foundation.mixin.fabric; | ||
|
|
||
| import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
|
|
||
| import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController; | ||
| import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; | ||
| import com.simibubi.create.foundation.utility.fabric.AbstractMinecartExtensions; | ||
|
|
||
| import io.github.fabricators_of_create.porting_lib.util.LazyOptional; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.nbt.Tag; | ||
| import net.minecraft.world.entity.EntityType; | ||
| import net.minecraft.world.entity.vehicle.AbstractMinecart; | ||
| import net.minecraft.world.level.Level; | ||
|
|
||
| @Mixin(AbstractMinecart.class) | ||
| public abstract class AbstractMinecartMixin implements AbstractMinecartExtensions { | ||
| @Unique | ||
| public CapabilityMinecartController create$controllerCap = null; | ||
|
|
||
| @Override | ||
| public CapabilityMinecartController getCap() { | ||
| return create$controllerCap; | ||
| private MinecartController controller; | ||
|
|
||
| @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN")) | ||
| private void initController(EntityType<?> entityType, Level level, CallbackInfo ci) { | ||
| this.controller = new MinecartController((AbstractMinecart) (Object) this); | ||
| if (level != null) { // don't trust modders | ||
| CapabilityMinecartController.attach((AbstractMinecart) (Object) this); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void setCap(CapabilityMinecartController cap) { | ||
| this.create$controllerCap = cap; | ||
| @Inject(method = "readAdditionalSaveData", at = @At("HEAD")) | ||
| private void loadController(CompoundTag compound, CallbackInfo ci) { | ||
| if (compound.contains(CAP_KEY, Tag.TAG_COMPOUND)) | ||
| controller.deserializeNBT(compound.getCompound(CAP_KEY)); | ||
| } | ||
|
|
||
| @Override | ||
| public LazyOptional<MinecartController> lazyController() { | ||
| return create$controllerCap.cap; | ||
| @Inject(method = "addAdditionalSaveData", at = @At("HEAD")) | ||
| private void saveController(CompoundTag compound, CallbackInfo ci) { | ||
| compound.put(CAP_KEY, controller.serializeNBT()); | ||
| } | ||
|
|
||
| @Override | ||
| public MinecartController getController() { | ||
| return create$controllerCap.handler; | ||
| public MinecartController create$getController() { | ||
| return controller; | ||
| } | ||
| } |
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
41 changes: 1 addition & 40 deletions
41
src/main/java/com/simibubi/create/foundation/utility/fabric/AbstractMinecartExtensions.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 |
|---|---|---|
| @@ -1,48 +1,9 @@ | ||
| package com.simibubi.create.foundation.utility.fabric; | ||
|
|
||
| import com.simibubi.create.content.contraptions.minecart.capability.CapabilityMinecartController; | ||
| import com.simibubi.create.content.contraptions.minecart.capability.MinecartController; | ||
|
|
||
| import io.github.fabricators_of_create.porting_lib.util.LazyOptional; | ||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.world.entity.Entity; | ||
| import net.minecraft.world.entity.vehicle.AbstractMinecart; | ||
| import net.minecraft.world.level.Level; | ||
|
|
||
| public interface AbstractMinecartExtensions { | ||
| CapabilityMinecartController getCap(); | ||
|
|
||
| void setCap(CapabilityMinecartController cap); | ||
|
|
||
| LazyOptional<MinecartController> lazyController(); | ||
|
|
||
| MinecartController getController(); | ||
| MinecartController create$getController(); | ||
|
|
||
| String CAP_KEY = "Controller"; | ||
|
|
||
| static void minecartSpawn(Entity entity, Level level) { | ||
| if (entity instanceof AbstractMinecart cart) | ||
| CapabilityMinecartController.attach(cart); | ||
| } | ||
|
|
||
| static void minecartRead(Entity entity, CompoundTag data) { | ||
| if (entity instanceof AbstractMinecart cart && data.contains(CAP_KEY)) { | ||
| CompoundTag cap = data.getCompound(CAP_KEY); | ||
| cart.getCap().deserializeNBT(cap); | ||
| } | ||
| } | ||
|
|
||
| static void minecartWrite(Entity entity, CompoundTag data) { | ||
| if (entity instanceof AbstractMinecart cart && cart.getCap() != null) { | ||
| CompoundTag capTag = cart.getCap().serializeNBT(); | ||
| data.put(CAP_KEY, capTag); | ||
| } | ||
| } | ||
|
|
||
| static void minecartRemove(Entity entity, Level level) { | ||
| if (entity instanceof AbstractMinecart cart) { | ||
| CapabilityMinecartController.onCartRemoved(level, cart); | ||
| cart.lazyController().invalidate(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.