21w44a
This commit is contained in:
1 parent
26a6d9713d
commit
1642976d0d
10 files changed
+17
-16
No files matched your search
+4
-4
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
# or better: https://modmuss50.me/fabric.html
|
# or better: https://modmuss50.me/fabric.html
|
||||||
minecraft_version=21w43a
|
minecraft_version=21w44a
|
||||||
yarn_mappings=21w43a+build.2
|
yarn_mappings=21w44a+build.1
|
||||||
loader_version=0.12.3
|
loader_version=0.12.4
|
||||||
fabric_version=0.41.2+1.18
|
fabric_version=0.41.4+1.18
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.4.51
|
mod_version = 1.4.51
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package carpet.fakes;
|
package carpet.fakes;
|
||||||
|
|
||||||
public interface ClientSettingsC2SPacketInterface {
|
public interface ClientSettingsC2SPacketInterface {
|
||||||
public String getLanguage();
|
//public String getLanguage();
|
||||||
}
|
}
|
||||||
@@ -33,7 +33,7 @@ public class BarrierBlock_updateSuppressionBlockMixin extends Block {
|
|||||||
BlockState stateAbove = world.getBlockState(fromPos);
|
BlockState stateAbove = world.getBlockState(fromPos);
|
||||||
if (stateAbove.isOf(Blocks.ACTIVATOR_RAIL) && !stateAbove.get(PoweredRailBlock.POWERED)) {
|
if (stateAbove.isOf(Blocks.ACTIVATOR_RAIL) && !stateAbove.get(PoweredRailBlock.POWERED)) {
|
||||||
if (CarpetSettings.updateSuppressionBlockSetting > 0) {
|
if (CarpetSettings.updateSuppressionBlockSetting > 0) {
|
||||||
world.method_39279(pos, this, CarpetSettings.updateSuppressionBlockSetting);// schedule tick
|
world.createAndScheduleBlockTick(pos, this, CarpetSettings.updateSuppressionBlockSetting);
|
||||||
}
|
}
|
||||||
throw new StackOverflowError("updateSuppressionBlock");
|
throw new StackOverflowError("updateSuppressionBlock");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,17 +2,19 @@ package carpet.mixins;
|
|||||||
|
|
||||||
import carpet.fakes.ClientSettingsC2SPacketInterface;
|
import carpet.fakes.ClientSettingsC2SPacketInterface;
|
||||||
import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket;
|
import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket;
|
||||||
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
|
||||||
@Mixin(ClientSettingsC2SPacket.class)
|
//@Mixin(ClientSettingsC2SPacket.class)
|
||||||
public class ClientSettingsC2SPacket_scarpetMixin implements ClientSettingsC2SPacketInterface {
|
public class ClientSettingsC2SPacket_scarpetMixin implements ClientSettingsC2SPacketInterface {
|
||||||
|
/* @Final
|
||||||
@Shadow
|
@Shadow
|
||||||
private String language;
|
private String language;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getLanguage(){
|
public String getLanguage(){
|
||||||
return this.language;
|
return this.language;
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,6 +138,6 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
|
|||||||
|
|
||||||
@Inject(method = "setClientSettings", at = @At("HEAD"))
|
@Inject(method = "setClientSettings", at = @At("HEAD"))
|
||||||
public void setClientSettings(ClientSettingsC2SPacket packet, CallbackInfo ci){
|
public void setClientSettings(ClientSettingsC2SPacket packet, CallbackInfo ci){
|
||||||
this.language = ((ClientSettingsC2SPacketInterface) packet).getLanguage();
|
this.language = packet.language();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -73,7 +73,7 @@ public abstract class StructureFeatureMixin<C extends FeatureConfig> implements
|
|||||||
if (!wireOnly)
|
if (!wireOnly)
|
||||||
{
|
{
|
||||||
Registry<StructureFeature<?>> registry3 = world.getRegistryManager().get(Registry.STRUCTURE_FEATURE_KEY);
|
Registry<StructureFeature<?>> registry3 = world.getRegistryManager().get(Registry.STRUCTURE_FEATURE_KEY);
|
||||||
world.method_36972(() -> {
|
world.setCurrentlyGeneratingStructureName(() -> {
|
||||||
Objects.requireNonNull(thiss);
|
Objects.requireNonNull(thiss);
|
||||||
return registry3.getKey(thiss).map(Object::toString).orElseGet(thiss::toString);
|
return registry3.getKey(thiss).map(Object::toString).orElseGet(thiss::toString);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import net.minecraft.block.BlockEntityProvider;
|
|||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.PistonExtensionBlock;
|
import net.minecraft.block.PistonExtensionBlock;
|
||||||
import net.minecraft.block.entity.BlockEntity;
|
import net.minecraft.block.entity.BlockEntity;
|
||||||
import net.minecraft.class_6752;
|
|
||||||
//import net.minecraft.fluid.Fluid;
|
//import net.minecraft.fluid.Fluid;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.ChunkPos;
|
import net.minecraft.util.math.ChunkPos;
|
||||||
@@ -17,6 +16,7 @@ import net.minecraft.world.Heightmap;
|
|||||||
//import net.minecraft.world.TickScheduler;
|
//import net.minecraft.world.TickScheduler;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.biome.Biome;
|
import net.minecraft.world.biome.Biome;
|
||||||
|
import net.minecraft.world.chunk.BlendingData;
|
||||||
import net.minecraft.world.chunk.Chunk;
|
import net.minecraft.world.chunk.Chunk;
|
||||||
import net.minecraft.world.chunk.ChunkSection;
|
import net.minecraft.world.chunk.ChunkSection;
|
||||||
import net.minecraft.world.chunk.UpgradeData;
|
import net.minecraft.world.chunk.UpgradeData;
|
||||||
@@ -35,9 +35,9 @@ public abstract class WorldChunk_movableTEMixin extends Chunk implements WorldCh
|
|||||||
@Final
|
@Final
|
||||||
World world;
|
World world;
|
||||||
|
|
||||||
public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry<Biome> registry, long l, @Nullable ChunkSection[] chunkSections, @Nullable class_6752 arg)
|
public WorldChunk_movableTEMixin(ChunkPos chunkPos, UpgradeData upgradeData, HeightLimitView heightLimitView, Registry<Biome> registry, long l, @Nullable ChunkSection[] chunkSections, @Nullable BlendingData blendingData)
|
||||||
{
|
{
|
||||||
super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, arg);
|
super(chunkPos, upgradeData, heightLimitView, registry, l, chunkSections, blendingData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ public abstract class World_getOtherEntitiesLimited implements WorldInterface {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Entity> getOtherEntitiesLimited(@Nullable Entity except, Box box, Predicate<? super Entity> predicate, int limit) {
|
public List<Entity> getOtherEntitiesLimited(@Nullable Entity except, Box box, Predicate<? super Entity> predicate, int limit) {
|
||||||
this.getProfiler().method_39278("getEntities"); // visit
|
this.getProfiler().visit("getEntities"); // visit
|
||||||
AtomicInteger checkedEntities = new AtomicInteger();
|
AtomicInteger checkedEntities = new AtomicInteger();
|
||||||
List<Entity> list = Lists.newArrayList();
|
List<Entity> list = Lists.newArrayList();
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ public class ShapesRenderer
|
|||||||
);
|
);
|
||||||
MatrixStack matrixStack = RenderSystem.getModelViewStack();
|
MatrixStack matrixStack = RenderSystem.getModelViewStack();
|
||||||
matrixStack.push();
|
matrixStack.push();
|
||||||
matrixStack.method_34425(matrices.peek().getPositionMatrix());
|
matrixStack.multiplyPositionMatrix(matrices.peek().getPositionMatrix());
|
||||||
RenderSystem.applyModelViewMatrix();
|
RenderSystem.applyModelViewMatrix();
|
||||||
|
|
||||||
// lines
|
// lines
|
||||||
|
|||||||
@@ -82,7 +82,6 @@
|
|||||||
"ExperienceOrbEntityMixin",
|
"ExperienceOrbEntityMixin",
|
||||||
"PlayerActionC2SPacketMixin",
|
"PlayerActionC2SPacketMixin",
|
||||||
"ServerPlayerEntityMixin",
|
"ServerPlayerEntityMixin",
|
||||||
"ClientSettingsC2SPacket_scarpetMixin",
|
|
||||||
"PlayerManager_coreMixin",
|
"PlayerManager_coreMixin",
|
||||||
"PlayerManager_fakePlayersMixin",
|
"PlayerManager_fakePlayersMixin",
|
||||||
"RedstoneWireBlockMixin",
|
"RedstoneWireBlockMixin",
|
||||||
|
|||||||
Reference in new issue
Block a user