icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove no longer needed Mixins (#1030)

Browse Source
This commit is contained in:
altrisi authored and GitHub committed 2021-07-26 09:20:01 -03:00
1 parent 19ad8cfbf3
commit 2a391962ff
14 files changed
+8 -175
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/CustomPayloadC2SPacketMixin.java
-27
View File
@@ -1,27 +0,0 @@
package carpet.mixins;
import carpet.fakes.CustomPayloadC2SPacketInterface;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(CustomPayloadC2SPacket.class)
public class CustomPayloadC2SPacketMixin implements CustomPayloadC2SPacketInterface
{
@Shadow
private Identifier channel;
@Shadow
private PacketByteBuf data;
@Override
public Identifier getPacketChannel() {
return channel;
}
@Override
public PacketByteBuf getPacketData() {
return new PacketByteBuf(this.data.copy());
}
}
src/main/java/carpet/mixins/HungerManagerMixin_scarpetEventsMixin.java
-18
View File
@@ -1,18 +0,0 @@
package carpet.mixins;
import carpet.fakes.HungerManagerInterface;
import net.minecraft.entity.player.HungerManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(HungerManager.class)
public class HungerManagerMixin_scarpetEventsMixin implements HungerManagerInterface {
@Shadow private float exhaustion;
@Shadow private float foodSaturationLevel;
@Override
public float getExhaustionCM(){ return exhaustion; }
@Override
public void setExhaustionCM(float exhaust) { exhaustion = exhaust; }
@Override
public void setSaturationCM(float saturn) { foodSaturationLevel = saturn; }
}
src/main/java/carpet/mixins/ServerPlayNetworkHandlerMixin.java
+3 -3
View File
@@ -1,8 +1,8 @@
package carpet.mixins;
import carpet.fakes.CustomPayloadC2SPacketInterface;
import carpet.network.CarpetClient;
import carpet.network.ServerNetworkHandler;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
@@ -21,10 +21,10 @@ public class ServerPlayNetworkHandlerMixin
@Inject(method = "onCustomPayload", at = @At("HEAD"), cancellable = true)
private void onCustomCarpetPayload(CustomPayloadC2SPacket packet, CallbackInfo ci)
{
Identifier channel = ((CustomPayloadC2SPacketInterface) packet).getPacketChannel();
Identifier channel = packet.getChannel();
if (CarpetClient.CARPET_CHANNEL.equals(channel))
{
ServerNetworkHandler.handleData(((CustomPayloadC2SPacketInterface) packet).getPacketData(), player);
ServerNetworkHandler.handleData(new PacketByteBuf(packet.getData().copy()), player);
ci.cancel();
}
}
src/main/java/carpet/mixins/ServerWorld_onePlayerSleepingMixin.java
-53
View File
@@ -1,53 +0,0 @@
package carpet.mixins;
import carpet.CarpetSettings;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Stream;
@Mixin(ServerWorld.class)
public class ServerWorld_onePlayerSleepingMixin
{/* removed due to 1.17 changes
@Shadow @Final private List<ServerPlayerEntity> players;
@Shadow private boolean allPlayersSleeping;
@Inject(method = "updateSleepingPlayers", cancellable = true, at = @At("HEAD"))
private void updateOnePlayerSleeping(CallbackInfo ci)
{
if(CarpetSettings.onePlayerSleeping)
{
allPlayersSleeping = false;
for (ServerPlayerEntity p : players)
if (!p.isSpectator() && p.isSleeping())
{
allPlayersSleeping = true;
ci.cancel();
return;
}
ci.cancel();
}
}
@Redirect(method = "tick", at = @At(
value = "INVOKE",
target = "Ljava/util/stream/Stream;noneMatch(Ljava/util/function/Predicate;)Z"
))
private boolean noneMatchSleep(Stream<ServerPlayerEntity> stream, Predicate<ServerPlayerEntity> predicate)
{
if (CarpetSettings.onePlayerSleeping)
return stream.anyMatch((p) -> !p.isSpectator() && p.isSleepingLongEnough());
return stream.noneMatch(predicate);
}
*/
}
src/main/java/carpet/mixins/StatType_scarpetMixin.java
-22
View File
@@ -1,22 +0,0 @@
package carpet.mixins;
import carpet.fakes.StatTypeInterface;
import net.minecraft.stat.Stat;
import net.minecraft.stat.StatType;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import java.util.Map;
@Mixin(StatType.class)
public class StatType_scarpetMixin<T> implements StatTypeInterface<T>
{
@Shadow @Final private Map<T, Stat<T>> stats;
@Override
public boolean hasStatCreated(T key)
{
return this.stats.containsKey(key);
}
}
src/main/java/carpet/mixins/WeightedPickerEntryMixin.java
-12
View File
@@ -1,12 +0,0 @@
package carpet.mixins;
import net.minecraft.util.collection.WeightedPicker;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(WeightedPicker.Entry.class)
public interface WeightedPickerEntryMixin
{/* /// not needed in 1.17
@Accessor("weight")
int getWeight();*/
}