From 179bc21223ea661152b6b87d8cd7efed3304f44b Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 23 Aug 2019 06:57:17 +0200 Subject: [PATCH] 115 changes --- gradle.properties | 8 ++++---- src/main/java/carpet/commands/CameraModeCommand.java | 8 ++++---- .../BlockEntityRenderDispatcher_movableTEMixin.java | 7 +++---- .../carpet/mixins/LivingEntity_maxCollisionsMixin.java | 2 +- .../ServerPlayerInteractionManager_ghostBlocksMixin.java | 4 +++- .../StructureBlockBlockEntity_fillUpdatesMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/settings/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc5db410..97f0a326 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.14.4 - yarn_mappings=1.14.4+build.8 - loader_version=0.4.8+build.158 + minecraft_version=19w34a + yarn_mappings=19w34a+build.6 + loader_version=0.4.8+build.159 # Mod Properties - mod_version = 1.0.3+v190803 + mod_version = 1.0.4+v190823_115 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/commands/CameraModeCommand.java b/src/main/java/carpet/commands/CameraModeCommand.java index 1fb69827..60ea307a 100644 --- a/src/main/java/carpet/commands/CameraModeCommand.java +++ b/src/main/java/carpet/commands/CameraModeCommand.java @@ -54,8 +54,8 @@ public class CameraModeCommand player.setGameMode(GameMode.SPECTATOR); player.addVelocity(0,0.1,0); player.networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(player)); - player.addPotionEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 999999, 0, false, false)); - player.addPotionEffect(new StatusEffectInstance(StatusEffects.CONDUIT_POWER, 999999, 0, false, false)); + player.addStatusEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 999999, 0, false, false)); + player.addStatusEffect(new StatusEffectInstance(StatusEffects.CONDUIT_POWER, 999999, 0, false, false)); return 1; } private static int survivalMode(ServerCommandSource source, ServerPlayerEntity player) @@ -63,9 +63,9 @@ public class CameraModeCommand if (!(iCanHasPermissions(source, player))) return 0; player.setGameMode(GameMode.SURVIVAL); player.networkHandler.sendPacket(new RemoveEntityEffectS2CPacket(player.getEntityId(), StatusEffects.NIGHT_VISION)); - player.removePotionEffect(StatusEffects.NIGHT_VISION); + player.removeStatusEffect(StatusEffects.NIGHT_VISION); player.networkHandler.sendPacket(new RemoveEntityEffectS2CPacket(player.getEntityId(), StatusEffects.CONDUIT_POWER)); - player.removePotionEffect(StatusEffects.CONDUIT_POWER); + player.removeStatusEffect(StatusEffects.CONDUIT_POWER); return 1; } diff --git a/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java b/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java index b5106d01..5a2ebdee 100644 --- a/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java +++ b/src/main/java/carpet/mixins/BlockEntityRenderDispatcher_movableTEMixin.java @@ -1,8 +1,7 @@ package carpet.mixins; import carpet.fakes.BlockEntityRenderDispatcherInterface; -import com.mojang.blaze3d.platform.GLX; -import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.render.Camera; import net.minecraft.client.render.GuiLighting; @@ -44,8 +43,8 @@ public abstract class BlockEntityRenderDispatcher_movableTEMixin implements Bloc int i = this.world.getLightmapIndex(blockEntity_1.getPos(), 0); int j = i % 65536; int k = i / 65536; - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, (float) j, (float) k); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.glMultiTexCoord2f(33985, (float) j, (float) k); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); BlockPos blockpos = blockEntity_1.getPos(); this.renderEntity(blockEntity_1, (double) blockpos.getX() - renderOffsetX + xOffset, (double) blockpos.getY() - renderOffsetY + yOffset, (double) blockpos.getZ() - renderOffsetZ + zOffset, partialTicks, destroyStage, false); } diff --git a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java index 25af57e5..9f3fd7d7 100644 --- a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java +++ b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java @@ -27,7 +27,7 @@ public abstract class LivingEntity_maxCollisionsMixin extends Entity @Shadow protected abstract void pushAway(Entity entity_1); - @Inject(method = "tickPushing", cancellable = true, at = @At("HEAD")) + @Inject(method = "tickCramming", cancellable = true, at = @At("HEAD")) private void tickPushingReplacement(CallbackInfo ci) { List list_1 = this.world.getEntities((Entity)this, this.getBoundingBox(), EntityPredicates.canBePushedBy(this)); diff --git a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java index 87300ca7..06f96f95 100644 --- a/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java +++ b/src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java @@ -21,6 +21,8 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin { @Shadow public ServerPlayerEntity player; + /* + 1.15 changes the protocol to include instamine as a possible action @Redirect(method = "method_14263", at = @At( value = "INVOKE", target = "Lnet/minecraft/block/BlockState;calcBlockBreakingDelta(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)F") @@ -42,7 +44,7 @@ public class ServerPlayerInteractionManager_ghostBlocksMixin ) return 1.0f; return progress; - } + }*/ @ModifyConstant(method = "method_14263", constant = @Constant(doubleValue = 36D)) diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java index e95c2c2f..ec085ba5 100644 --- a/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java +++ b/src/main/java/carpet/mixins/StructureBlockBlockEntity_fillUpdatesMixin.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(StructureBlockBlockEntity.class) public abstract class StructureBlockBlockEntity_fillUpdatesMixin { - @Redirect(method = "loadStructure(Z)Z", at = @At( + @Redirect(method = "method_21864", at = @At( value = "INVOKE", target = "Lnet/minecraft/structure/Structure;place(Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/structure/StructurePlacementData;)V" )) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 70558a8c..fcbf681a 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2571,7 +2571,7 @@ public class CarpetExpression ); armorstand.addScoreboardTag("__scarpet_marker"); if (targetBlock != null) - armorstand.setEquippedStack(EquipmentSlot.HEAD, new ItemStack(targetBlock.getBlock().asItem())); + armorstand.equipStack(EquipmentSlot.HEAD, new ItemStack(targetBlock.getBlock().asItem())); if (!name.isEmpty()) { armorstand.setCustomName(new LiteralText(name)); diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index 8328f013..da9f0d78 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -26,7 +26,7 @@ import static carpet.settings.RuleCategory.SURVIVAL; public class CarpetSettings { - public static final String carpetVersion = "1.0.3-v190803"; + public static final String carpetVersion = "1.0.4-v190823_115"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 74d7a656..554e5be5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.0.3", + "version": "1.0.4", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",