From 8a2ddcbf2a80ba6bdc22672fbfbab7b44f6e13bb Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 1 Oct 2020 14:14:01 -0300 Subject: [PATCH] 1.4.12 --- build.gradle | 2 +- gradle.properties | 6 +++--- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/java/carpet/commands/DrawCommand.java | 2 +- src/main/java/carpet/commands/LogCommand.java | 2 +- src/main/java/carpet/commands/MobAICommand.java | 2 +- src/main/java/carpet/commands/PlayerCommand.java | 2 +- src/main/java/carpet/commands/ScriptCommand.java | 6 +++--- src/main/java/carpet/commands/SpawnCommand.java | 2 +- src/main/java/carpet/commands/TickCommand.java | 2 +- .../java/carpet/mixins/VillagerEntity_aiMixin.java | 14 ++++++++------ .../java/carpet/patches/EntityPlayerMPFake.java | 4 ++-- src/main/java/carpet/settings/SettingsManager.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 14 files changed, 26 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index c9cfacd7..9fcfdc6b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.4-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index e721f7d1..37b76647 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.16.3 - yarn_mappings=1.16.3+build.1 - loader_version=0.9.3+build.207 + yarn_mappings=1.16.3+build.18 + loader_version=0.10.0+build.208 # Mod Properties - mod_version = 1.4.11+v200910 + mod_version = 1.4.12+v201001 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index ce4a2045..76f8e427 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -35,7 +35,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.4.11+v200910"; + public static final String carpetVersion = "1.4.12+v201001"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/java/carpet/commands/DrawCommand.java b/src/main/java/carpet/commands/DrawCommand.java index 7547d10a..0644d88d 100644 --- a/src/main/java/carpet/commands/DrawCommand.java +++ b/src/main/java/carpet/commands/DrawCommand.java @@ -31,7 +31,7 @@ import java.lang.Math; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class DrawCommand { diff --git a/src/main/java/carpet/commands/LogCommand.java b/src/main/java/carpet/commands/LogCommand.java index 751acc26..fdfafb48 100644 --- a/src/main/java/carpet/commands/LogCommand.java +++ b/src/main/java/carpet/commands/LogCommand.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import static com.mojang.brigadier.arguments.StringArgumentType.getString; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class LogCommand { diff --git a/src/main/java/carpet/commands/MobAICommand.java b/src/main/java/carpet/commands/MobAICommand.java index 5bdbf823..865c62b3 100644 --- a/src/main/java/carpet/commands/MobAICommand.java +++ b/src/main/java/carpet/commands/MobAICommand.java @@ -12,7 +12,7 @@ import net.minecraft.util.registry.Registry; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class MobAICommand { diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index 6ff70d33..f845b8db 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/src/main/java/carpet/commands/PlayerCommand.java @@ -37,7 +37,7 @@ import java.util.function.Consumer; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class PlayerCommand { diff --git a/src/main/java/carpet/commands/ScriptCommand.java b/src/main/java/carpet/commands/ScriptCommand.java index 589fcf0e..ffc5efc5 100644 --- a/src/main/java/carpet/commands/ScriptCommand.java +++ b/src/main/java/carpet/commands/ScriptCommand.java @@ -48,12 +48,12 @@ import java.util.stream.Collectors; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class ScriptCommand { - private static TreeSet scarpetFunctions; - private static TreeSet APIFunctions; + private static final TreeSet scarpetFunctions; + private static final TreeSet APIFunctions; static { Set allFunctions = (new CarpetExpression(null, "null", null, null)).getExpr().getFunctionNames(); diff --git a/src/main/java/carpet/commands/SpawnCommand.java b/src/main/java/carpet/commands/SpawnCommand.java index 7630032f..dfd67887 100644 --- a/src/main/java/carpet/commands/SpawnCommand.java +++ b/src/main/java/carpet/commands/SpawnCommand.java @@ -30,7 +30,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.string; import static com.mojang.brigadier.arguments.StringArgumentType.word; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class SpawnCommand diff --git a/src/main/java/carpet/commands/TickCommand.java b/src/main/java/carpet/commands/TickCommand.java index cee0741a..696512e2 100644 --- a/src/main/java/carpet/commands/TickCommand.java +++ b/src/main/java/carpet/commands/TickCommand.java @@ -20,7 +20,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; +import static net.minecraft.command.CommandSource.suggestMatching; public class TickCommand { diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java index 4d968875..b0e76355 100644 --- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java +++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java @@ -10,7 +10,7 @@ import net.minecraft.entity.ai.brain.Activity; import net.minecraft.entity.ai.brain.Memory; import net.minecraft.entity.ai.brain.MemoryModuleType; import net.minecraft.entity.ai.pathing.Path; -import net.minecraft.entity.passive.AbstractTraderEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BedItem; @@ -39,7 +39,7 @@ import java.util.Optional; import java.util.stream.Collectors; @Mixin(VillagerEntity.class) -public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity +public abstract class VillagerEntity_aiMixin extends MerchantEntity { @Shadow protected abstract void sayNo(); @@ -51,6 +51,11 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity boolean hasBed; int displayAge; + public VillagerEntity_aiMixin(EntityType entityType_1, World world_1) + { + super(entityType_1, world_1); + } + @Inject(method = "tick", at = @At("HEAD")) private void ontick(CallbackInfo ci) { @@ -182,8 +187,5 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity } } - public VillagerEntity_aiMixin(EntityType entityType_1, World world_1) - { - super(entityType_1, world_1); - } + } diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 570dc464..de2ca657 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -48,7 +48,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity instance.setHealth(20.0F); instance.removed = false; instance.stepHeight = 0.6F; - interactionManagerIn.method_30118(gamemode); // setGameMode + interactionManagerIn.setGameMode(gamemode); server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), dimensionId);//instance.dimension); server.getPlayerManager().sendToDimension(new EntityPositionS2CPacket(instance), dimensionId);//instance.dimension); instance.getServerWorld().getChunkManager().updateCameraPosition(instance); @@ -68,7 +68,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity playerShadow.setHealth(player.getHealth()); playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.yaw, player.pitch); - interactionManagerIn.method_30118(player.interactionManager.getGameMode()); // setGameMode + interactionManagerIn.setGameMode(player.interactionManager.getGameMode()); ((ServerPlayerEntityInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerEntityInterface) player).getActionPack()); playerShadow.stepHeight = 0.6F; playerShadow.dataTracker.set(PLAYER_MODEL_PARTS, player.getDataTracker().get(PLAYER_MODEL_PARTS)); diff --git a/src/main/java/carpet/settings/SettingsManager.java b/src/main/java/carpet/settings/SettingsManager.java index 92de4d76..bf62e5d1 100644 --- a/src/main/java/carpet/settings/SettingsManager.java +++ b/src/main/java/carpet/settings/SettingsManager.java @@ -43,9 +43,9 @@ import java.util.TreeMap; import java.util.stream.Collectors; import static carpet.utils.Translations.tr; +import static net.minecraft.command.CommandSource.suggestMatching; import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; -import static net.minecraft.server.command.CommandSource.suggestMatching; public class SettingsManager { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8322ac9d..e237759d 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.4.11", + "version": "1.4.12", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",