From ac7a373dd8e205cd86949167d933bb0cba530753 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 8 Aug 2023 21:35:05 -0500 Subject: [PATCH 01/29] 1.20.2 shifts everything down by .25 --- src/main/java/one/oth3r/sit/Events.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index 78ed95a..0bd366f 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -113,23 +113,24 @@ public class Events { public static void setEntity(BlockPos pos, World world, Entity entity) { Block block = world.getBlockState(pos).getBlock(); entity.setCustomName(Text.of(Sit.ENTITY_NAME)); + double hitBoxY = 0.5; entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.47, pos.getZ() + 0.5, 0, 0); entity.setInvulnerable(true); if (block instanceof StairsBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.27, pos.getZ() + 0.5, 0, 0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5)); + hitBoxY = 2; } if (block instanceof SlabBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.27, pos.getZ() + 0.5, 0, 0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,1,1.5)); + hitBoxY = 1; } if (block instanceof CarpetBlock) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()-.17, pos.getZ() + 0.5, 0, 0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,0.125,1.5)); + hitBoxY = 0.125; } if (world.getBlockState(pos).isFullCube(world,pos.add(0,1,0))) { entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+.78, pos.getZ() + 0.5, 0, 0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5)); + hitBoxY = 2; } if (config.customOn && config.customBlocks.size() != 0) { for (HashMap map:getCustomBlocks().values()) { @@ -137,12 +138,15 @@ public class Events { if (map.get("block").equals(blockID)) { double input = Math.max(Math.min(Double.parseDouble((String) map.get("height")),1),0); entity.updatePositionAndAngles(pos.getX() + 0.5, pos.getY()+input-.22, pos.getZ() + 0.5, 0, 0); - entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,Double.parseDouble((String) map.get("hitbox")),1.5)); + hitBoxY = Double.parseDouble((String) map.get("hitbox")); } } } + //1.20.2 mounting pos change (shifts everything down by .25) + entity.updatePositionAndAngles(entity.getX(),entity.getY()+.25,entity.getZ(),0,0); + entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,hitBoxY,1.5)); //change pitch based on if player is sitting below block height or not - if (entity.getY() <= pos.getY()+.35) entity.setPitch(90); + if (entity.getY() <= pos.getY()+.35+.25) entity.setPitch(90); else entity.setPitch(-90); } public static void register() { From 68cf4532b458503735919fc1b0a75fc01bd70f13 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 8 Aug 2023 21:36:33 -0500 Subject: [PATCH 02/29] b1.0.2+23w31a --- build.gradle | 4 +- gradle.properties | 10 +- src/main/java/one/oth3r/sit/ModMenu.java | 392 +++++++++++------------ src/main/resources/fabric.mod.json | 5 +- 4 files changed, 204 insertions(+), 207 deletions(-) diff --git a/build.gradle b/build.gradle index 243770a..81698be 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" - modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}" +// modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" +// modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}" // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. diff --git a/gradle.properties b/gradle.properties index 05c46e0..c0d12d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.9 -loader_version=0.14.21 +minecraft_version=23w31a +yarn_mappings=23w31a+build.12 +loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20-1.20.1 +mod_version=1.0.2+23w31a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.85.0+1.20.1 +fabric_version=0.86.1+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/java/one/oth3r/sit/ModMenu.java b/src/main/java/one/oth3r/sit/ModMenu.java index 1ee4e27..2d6e6ec 100644 --- a/src/main/java/one/oth3r/sit/ModMenu.java +++ b/src/main/java/one/oth3r/sit/ModMenu.java @@ -1,196 +1,196 @@ -package one.oth3r.sit; - -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import dev.isxander.yacl3.api.*; -import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; -import dev.isxander.yacl3.api.controller.EnumControllerBuilder; -import dev.isxander.yacl3.api.controller.StringControllerBuilder; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; -import net.minecraft.text.TextColor; -import net.minecraft.util.Formatting; - -public class ModMenu implements ModMenuApi { - private static MutableText lang(String key) { - return Text.translatable("config.sit."+key); - } - private static MutableText lang(String key, Object... args) { - return Text.translatable("config.sit."+key,args); - } - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> YetAnotherConfigLib.createBuilder().save(config::save) - .title(Text.of("Sit!")) - .category(ConfigCategory.createBuilder() - .name(lang("category.general")) - .tooltip(lang("category.general.tooltip")) - .option(Option.createBuilder() - .name(lang("general.keep_active")) - .description(OptionDescription.of(lang("general.keep_active.description"))) - .binding(config.defaults.keepActive, () -> config.keepActive, n -> config.keepActive = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("general.sit_while_seated")) - .description(OptionDescription.of(lang("general.sit_while_seated.description"))) - .binding(config.defaults.sitWhileSeated, () -> config.sitWhileSeated, n -> config.sitWhileSeated = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .group(OptionGroup.createBuilder() - .name(lang("general.sittable")) - .description(OptionDescription.of(lang("general.sittable.description"))) - .option(Option.createBuilder() - .name(lang("general.sittable.stairs")) - .binding(config.defaults.stairsOn, () -> config.stairsOn, n -> config.stairsOn = n) - .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("general.sittable.slabs")) - .binding(config.defaults.slabsOn, () -> config.slabsOn, n -> config.slabsOn = n) - .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("general.sittable.carpets")) - .binding(config.defaults.carpetsOn, () -> config.carpetsOn, n -> config.carpetsOn = n) - .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("general.sittable.full_blocks")) - .binding(config.defaults.fullBlocksOn, () -> config.fullBlocksOn, n -> config.fullBlocksOn = n) - .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("general.sittable.custom")) - .description(OptionDescription.of(lang("general.sittable.custom.description"))) - .binding(config.defaults.customOn, () -> config.customOn, n -> config.customOn = n) - .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) - .build()) - .build()) - .group(ListOption.createBuilder() - .name(lang("general.sittable_blocks")) - .description(OptionDescription.of( - lang("general.sittable_blocks.description") - .append("\n\n").append(lang("general.sittable_blocks.description_2")) - .append(lang("general.sittable_blocks.description_3", - lang("general.sittable_blocks.description_3_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))), - lang("general.sittable_blocks.description_3_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))), - lang("general.sittable_blocks.description_3_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))), - lang("general.sittable_blocks.description_3_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))) - .append("\n\n").append(lang("general.sittable_blocks.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) - .append("\n").append(lang("general.sittable_blocks.description_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))) - .append("\n").append(lang("general.sittable_blocks.description_6").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) - .append("\n").append(lang("general.sittable_blocks.description_7").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))) - .append("\n\n").append(lang("general.sittable_blocks.description_8").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.YELLOW)))))) - .binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n) - .controller(StringControllerBuilder::create) - .initial("") - .build()) - .build()) - .category(ConfigCategory.createBuilder() - .name(lang("category.main_hand")) - .tooltip(lang("category.main_hand.tooltip")) - .option(Option.createBuilder() - .name(lang("hand.requirements")) - .description(OptionDescription.of(lang("hand.requirements.description") - .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) - .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) - .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) - .binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n) - .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) - .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) - .build()) - .group(OptionGroup.createBuilder() - .name(lang("hand.restrictions")) - .description(OptionDescription.of(lang("hand.restrictions.description"))) - .option(Option.createBuilder() - .name(lang("hand.restrictions.blocks")) - .binding(config.defaults.mainBlock,()-> config.mainBlock,n -> config.mainBlock = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("hand.restrictions.food")) - .binding(config.defaults.mainFood,()-> config.mainFood,n -> config.mainFood = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("hand.restrictions.usable")) - .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) - .binding(config.defaults.mainUsable,()-> config.mainUsable,n -> config.mainUsable = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .build()) - .group(ListOption.createBuilder() - .name(lang("hand.whitelist")) - .description(OptionDescription.of(lang("hand.whitelist.description") - .append("\n\n").append(lang("hand.list.description")) - .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) - .binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n) - .controller(StringControllerBuilder::create) - .initial("") - .build()) - .group(ListOption.createBuilder() - .name(lang("hand.blacklist")) - .description(OptionDescription.of(lang("hand.blacklist.description") - .append("\n\n").append(lang("hand.list.description")) - .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) - .binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n) - .controller(StringControllerBuilder::create) - .initial("") - .build()) - .build()) - .category(ConfigCategory.createBuilder() - .name(lang("category.off_hand")) - .tooltip(lang("category.off_hand.tooltip")) - .option(Option.createBuilder() - .name(lang("hand.requirements")) - .description(OptionDescription.of(lang("hand.requirements.description") - .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) - .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) - .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) - .binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n) - .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) - .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) - .build()) - .group(OptionGroup.createBuilder() - .name(lang("hand.restrictions")) - .description(OptionDescription.of(lang("hand.restrictions.description"))) - .option(Option.createBuilder() - .name(lang("hand.restrictions.blocks")) - .binding(config.defaults.offBlock,()-> config.offBlock,n -> config.offBlock = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("hand.restrictions.food")) - .binding(config.defaults.offFood,()-> config.offFood,n -> config.offFood = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .option(Option.createBuilder() - .name(lang("hand.restrictions.usable")) - .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) - .binding(config.defaults.offUsable,()-> config.offUsable,n -> config.offUsable = n) - .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) - .build()) - .build()) - .group(ListOption.createBuilder() - .name(lang("hand.whitelist")) - .description(OptionDescription.of(lang("hand.whitelist.description") - .append("\n\n").append(lang("hand.list.description")) - .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) - .binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n) - .controller(StringControllerBuilder::create) - .initial("") - .build()) - .group(ListOption.createBuilder() - .name(lang("hand.blacklist")) - .description(OptionDescription.of(lang("hand.blacklist.description") - .append("\n\n").append(lang("hand.list.description")) - .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) - .binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n) - .controller(StringControllerBuilder::create) - .initial("") - .build()) - .build()) - .build().generateScreen(parent); - } -} +//package one.oth3r.sit; +// +//import com.terraformersmc.modmenu.api.ConfigScreenFactory; +//import com.terraformersmc.modmenu.api.ModMenuApi; +//import dev.isxander.yacl3.api.*; +//import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; +//import dev.isxander.yacl3.api.controller.EnumControllerBuilder; +//import dev.isxander.yacl3.api.controller.StringControllerBuilder; +//import net.minecraft.text.MutableText; +//import net.minecraft.text.Text; +//import net.minecraft.text.TextColor; +//import net.minecraft.util.Formatting; +// +//public class ModMenu implements ModMenuApi { +// private static MutableText lang(String key) { +// return Text.translatable("config.sit."+key); +// } +// private static MutableText lang(String key, Object... args) { +// return Text.translatable("config.sit."+key,args); +// } +// @Override +// public ConfigScreenFactory getModConfigScreenFactory() { +// return parent -> YetAnotherConfigLib.createBuilder().save(config::save) +// .title(Text.of("Sit!")) +// .category(ConfigCategory.createBuilder() +// .name(lang("category.general")) +// .tooltip(lang("category.general.tooltip")) +// .option(Option.createBuilder() +// .name(lang("general.keep_active")) +// .description(OptionDescription.of(lang("general.keep_active.description"))) +// .binding(config.defaults.keepActive, () -> config.keepActive, n -> config.keepActive = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("general.sit_while_seated")) +// .description(OptionDescription.of(lang("general.sit_while_seated.description"))) +// .binding(config.defaults.sitWhileSeated, () -> config.sitWhileSeated, n -> config.sitWhileSeated = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .group(OptionGroup.createBuilder() +// .name(lang("general.sittable")) +// .description(OptionDescription.of(lang("general.sittable.description"))) +// .option(Option.createBuilder() +// .name(lang("general.sittable.stairs")) +// .binding(config.defaults.stairsOn, () -> config.stairsOn, n -> config.stairsOn = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("general.sittable.slabs")) +// .binding(config.defaults.slabsOn, () -> config.slabsOn, n -> config.slabsOn = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("general.sittable.carpets")) +// .binding(config.defaults.carpetsOn, () -> config.carpetsOn, n -> config.carpetsOn = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("general.sittable.full_blocks")) +// .binding(config.defaults.fullBlocksOn, () -> config.fullBlocksOn, n -> config.fullBlocksOn = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("general.sittable.custom")) +// .description(OptionDescription.of(lang("general.sittable.custom.description"))) +// .binding(config.defaults.customOn, () -> config.customOn, n -> config.customOn = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) +// .build()) +// .build()) +// .group(ListOption.createBuilder() +// .name(lang("general.sittable_blocks")) +// .description(OptionDescription.of( +// lang("general.sittable_blocks.description") +// .append("\n\n").append(lang("general.sittable_blocks.description_2")) +// .append(lang("general.sittable_blocks.description_3", +// lang("general.sittable_blocks.description_3_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))), +// lang("general.sittable_blocks.description_3_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))), +// lang("general.sittable_blocks.description_3_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))), +// lang("general.sittable_blocks.description_3_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))) +// .append("\n\n").append(lang("general.sittable_blocks.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) +// .append("\n").append(lang("general.sittable_blocks.description_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))) +// .append("\n").append(lang("general.sittable_blocks.description_6").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) +// .append("\n").append(lang("general.sittable_blocks.description_7").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))) +// .append("\n\n").append(lang("general.sittable_blocks.description_8").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.YELLOW)))))) +// .binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n) +// .controller(StringControllerBuilder::create) +// .initial("") +// .build()) +// .build()) +// .category(ConfigCategory.createBuilder() +// .name(lang("category.main_hand")) +// .tooltip(lang("category.main_hand.tooltip")) +// .option(Option.createBuilder() +// .name(lang("hand.requirements")) +// .description(OptionDescription.of(lang("hand.requirements.description") +// .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) +// .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) +// .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) +// .binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n) +// .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) +// .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) +// .build()) +// .group(OptionGroup.createBuilder() +// .name(lang("hand.restrictions")) +// .description(OptionDescription.of(lang("hand.restrictions.description"))) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.blocks")) +// .binding(config.defaults.mainBlock,()-> config.mainBlock,n -> config.mainBlock = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.food")) +// .binding(config.defaults.mainFood,()-> config.mainFood,n -> config.mainFood = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.usable")) +// .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) +// .binding(config.defaults.mainUsable,()-> config.mainUsable,n -> config.mainUsable = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .build()) +// .group(ListOption.createBuilder() +// .name(lang("hand.whitelist")) +// .description(OptionDescription.of(lang("hand.whitelist.description") +// .append("\n\n").append(lang("hand.list.description")) +// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) +// .binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n) +// .controller(StringControllerBuilder::create) +// .initial("") +// .build()) +// .group(ListOption.createBuilder() +// .name(lang("hand.blacklist")) +// .description(OptionDescription.of(lang("hand.blacklist.description") +// .append("\n\n").append(lang("hand.list.description")) +// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) +// .binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n) +// .controller(StringControllerBuilder::create) +// .initial("") +// .build()) +// .build()) +// .category(ConfigCategory.createBuilder() +// .name(lang("category.off_hand")) +// .tooltip(lang("category.off_hand.tooltip")) +// .option(Option.createBuilder() +// .name(lang("hand.requirements")) +// .description(OptionDescription.of(lang("hand.requirements.description") +// .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) +// .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) +// .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) +// .binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n) +// .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) +// .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) +// .build()) +// .group(OptionGroup.createBuilder() +// .name(lang("hand.restrictions")) +// .description(OptionDescription.of(lang("hand.restrictions.description"))) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.blocks")) +// .binding(config.defaults.offBlock,()-> config.offBlock,n -> config.offBlock = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.food")) +// .binding(config.defaults.offFood,()-> config.offFood,n -> config.offFood = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .option(Option.createBuilder() +// .name(lang("hand.restrictions.usable")) +// .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) +// .binding(config.defaults.offUsable,()-> config.offUsable,n -> config.offUsable = n) +// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) +// .build()) +// .build()) +// .group(ListOption.createBuilder() +// .name(lang("hand.whitelist")) +// .description(OptionDescription.of(lang("hand.whitelist.description") +// .append("\n\n").append(lang("hand.list.description")) +// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) +// .binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n) +// .controller(StringControllerBuilder::create) +// .initial("") +// .build()) +// .group(ListOption.createBuilder() +// .name(lang("hand.blacklist")) +// .description(OptionDescription.of(lang("hand.blacklist.description") +// .append("\n\n").append(lang("hand.list.description")) +// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) +// .binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n) +// .controller(StringControllerBuilder::create) +// .initial("") +// .build()) +// .build()) +// .build().generateScreen(parent); +// } +//} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 13a5a5e..bf19e30 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,14 +20,11 @@ ], "server": [ "one.oth3r.sit.SitServer" - ], - "modmenu": [ - "one.oth3r.sit.ModMenu" ] }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": ">=1.20 <=1.20.1", + "minecraft": "1.20.2-alpha.23.31.a", "java": ">=17", "fabric-api": "*" }, From 59875d0f6d86ecb4523a248c443419a1c859a093 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 9 Aug 2023 17:08:00 -0500 Subject: [PATCH 03/29] b1.0.2+23w32a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index c0d12d0..85e02a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w31a -yarn_mappings=23w31a+build.12 +minecraft_version=23w32a +yarn_mappings=23w32a+build.3 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+23w31a +mod_version=1.0.2+23w32a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.86.1+1.20.2 +fabric_version=0.86.2+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bf19e30..79a409f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-alpha.23.31.a", + "minecraft": "1.20.2-alpha.23.32.a", "java": ">=17", "fabric-api": "*" }, From 997c7c131a848e15f1c625e08fd19a86c0a85ecd Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 17 Aug 2023 12:38:17 -0500 Subject: [PATCH 04/29] b1.0.2+23w33a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85e02a5..9425bf9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w32a -yarn_mappings=23w32a+build.3 +minecraft_version=23w33a +yarn_mappings=23w33a+build.1 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+23w32a +mod_version=1.0.2+23w33a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.86.2+1.20.2 +fabric_version=0.87.1+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 79a409f..7972945 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-alpha.23.32.a", + "minecraft": "1.20.2-alpha.23.33.a", "java": ">=17", "fabric-api": "*" }, From f4c29773d079eff5064a7bec0ac53efa7af19a5a Mon Sep 17 00:00:00 2001 From: Oth3r Date: Fri, 1 Sep 2023 14:17:37 -0500 Subject: [PATCH 05/29] b1.0.2+23w35a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9425bf9..01159e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w33a -yarn_mappings=23w33a+build.1 +minecraft_version=23w35a +yarn_mappings=23w35a+build.4 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+23w33a +mod_version=1.0.2+23w35a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.87.1+1.20.2 +fabric_version=0.87.2+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7972945..309e79a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-alpha.23.33.a", + "minecraft": "1.20.2-alpha.23.35.a", "java": ">=17", "fabric-api": "*" }, From 7b3b914934b9b823fc2c793efb63a5aa34e16c4b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 5 Sep 2023 16:46:36 -0500 Subject: [PATCH 06/29] b1.0.2+1.20.2-pre1 --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 01159e8..4d0fc9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w35a -yarn_mappings=23w35a+build.4 +minecraft_version=1.20.2-pre1 +yarn_mappings=1.20.2-pre1+build.3 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+23w35a +mod_version=1.0.2+1.20.2-pre1 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.87.2+1.20.2 +fabric_version=0.88.2+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 309e79a..661e7ab 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-alpha.23.35.a", + "minecraft": "1.20.2-beta.1", "java": ">=17", "fabric-api": "*" }, From 4b679b41262c87a8bfe04f24987cc907085e9736 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 7 Sep 2023 14:26:09 -0500 Subject: [PATCH 07/29] b1.0.2+1.20.2-pre2 --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4d0fc9b..ae47a43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2-pre1 -yarn_mappings=1.20.2-pre1+build.3 +minecraft_version=1.20.2-pre2 +yarn_mappings=1.20.2-pre2+build.2 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20.2-pre1 +mod_version=1.0.2+1.20.2-pre2 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.88.2+1.20.2 +fabric_version=0.88.3+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 661e7ab..299e924 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-beta.1", + "minecraft": "1.20.2-beta.2", "java": ">=17", "fabric-api": "*" }, From f3b9e82cb48654a336255a5f418e66d327a7e29e Mon Sep 17 00:00:00 2001 From: Oth3r Date: Tue, 12 Sep 2023 12:41:58 -0500 Subject: [PATCH 08/29] b1.0.2+1.20.2-pre3 --- gradle.properties | 6 +++--- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index ae47a43..b3487ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2-pre2 -yarn_mappings=1.20.2-pre2+build.2 +minecraft_version=1.20.2-pre3 +yarn_mappings=1.20.2-pre3+build.5 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20.2-pre2 +mod_version=1.0.2+1.20.2-pre3 maven_group=one.oth3r archives_base_name=sit! diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 299e924..92b57b2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-beta.2", + "minecraft": "1.20.2-beta.3", "java": ">=17", "fabric-api": "*" }, From 8d5b0fb27a1262c846bc45ce944a3e07a03d70a4 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 13 Sep 2023 12:38:24 -0500 Subject: [PATCH 09/29] b1.0.2+1.20.2-pre4 --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b3487ba..91a0b4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2-pre3 -yarn_mappings=1.20.2-pre3+build.5 +minecraft_version=1.20.2-pre4 +yarn_mappings=1.20.2-pre1+build.1 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20.2-pre3 +mod_version=1.0.2+1.20.2-pre4 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.88.3+1.20.2 +fabric_version=0.88.4+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 92b57b2..9737bc4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-beta.3", + "minecraft": "1.20.2-beta.4", "java": ">=17", "fabric-api": "*" }, From c2819b08eb867af2accef7e6d3cb1b4025481d90 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Sat, 16 Sep 2023 12:33:50 -0500 Subject: [PATCH 10/29] b1.0.2+1.20.2-rc1 --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 91a0b4f..1c5851e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2-pre4 -yarn_mappings=1.20.2-pre1+build.1 +minecraft_version=1.20.2-rc1 +yarn_mappings=1.20.2-rc1+build.2 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20.2-pre4 +mod_version=1.0.2+1.20.2-rc1 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.88.4+1.20.2 +fabric_version=0.88.5+1.20.2 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9737bc4..1f0d0ec 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-beta.4", + "minecraft": "1.20.2-rc.1", "java": ">=17", "fabric-api": "*" }, From 1dab3c8000d35ff4beba5a5a957c2c4fb9aa1290 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 18 Sep 2023 15:18:37 -0500 Subject: [PATCH 11/29] b1.0.2+1.20.2-rc1-1.20.2-rc2 --- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1c5851e..57ad480 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.2-rc1+build.2 loader_version=0.14.22 # Mod Properties -mod_version=1.0.2+1.20.2-rc1 +mod_version=1.0.2+1.20.2-rc1-1.20.2-rc2 maven_group=one.oth3r archives_base_name=sit! diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1f0d0ec..849898d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,10 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": "1.20.2-rc.1", + "minecraft": [ + "1.20.2-rc.1", + "1.20.2-rc.2" + ], "java": ">=17", "fabric-api": "*" }, From 65e051c4650a1a70863693fd143eb51765ae61dd Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 12 Oct 2023 22:19:34 -0500 Subject: [PATCH 12/29] 1.20.3 fixes --- src/main/java/one/oth3r/sit/LangReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/one/oth3r/sit/LangReader.java b/src/main/java/one/oth3r/sit/LangReader.java index e34692c..b6ae51b 100644 --- a/src/main/java/one/oth3r/sit/LangReader.java +++ b/src/main/java/one/oth3r/sit/LangReader.java @@ -61,7 +61,7 @@ public class LangReader { return txt; } } - return MutableText.of(TextContent.EMPTY).append(translated); + return Text.empty().append(translated); } public static LangReader of(String translationKey, Object... placeholders) { return new LangReader(translationKey, placeholders); From fc7b734ef6999c34215dc4951dd67e9b7c135391 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 12 Oct 2023 22:20:06 -0500 Subject: [PATCH 13/29] test for a strict list of blocks allowed above a sit entity --- src/main/java/one/oth3r/sit/Events.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index 0bd366f..ca13eb0 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -78,20 +78,22 @@ public class Events { } return map; } - @SuppressWarnings("deprecation") public static boolean checkBlocks(BlockPos pos, World world) { BlockState blockState = world.getBlockState(pos); Block block = blockState.getBlock(); BlockState blockStateAbove = world.getBlockState(pos.add(0,1,0)); Block blockAbove = blockStateAbove.getBlock(); - //not the biggest fan but ah well - if (blockStateAbove.isFullCube(world,pos.add(0,1,0)) && blockStateAbove.blocksMovement()) return false; - else if (blockAbove instanceof StairsBlock || blockAbove instanceof SlabBlock || blockAbove instanceof CarpetBlock) return false; + // todo strict checker option to check 2 blocks above?? + // set amount of blocks that can be above a chair + if (!(blockAbove instanceof SignBlock || blockAbove instanceof TrapdoorBlock || blockAbove instanceof BannerBlock)) return false; + //if there's already an entity at the block location or above it for (Entity entity:entities.values()) if (entity.getBlockPos().equals(pos) || entity.getBlockPos().add(0,1,0).equals(pos)) return false; + // return for the 4 default types if (block instanceof StairsBlock && config.stairsOn) return blockState.get(StairsBlock.HALF) == BlockHalf.BOTTOM; if (block instanceof SlabBlock && config.slabsOn) return blockState.get(SlabBlock.TYPE) == SlabType.BOTTOM; if (block instanceof CarpetBlock && config.carpetsOn) return true; if (blockState.isFullCube(world,pos.add(0,1,0)) && config.fullBlocksOn) return true; + // custom checker if (config.customOn && config.customBlocks.size() != 0) { for (HashMap map:getCustomBlocks().values()) { String blockID = Registries.BLOCK.getId(block).toString(); From 5f1564a53af0abc76576a3e685ad8c38b77238e6 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 12 Oct 2023 22:20:43 -0500 Subject: [PATCH 14/29] b1.0.3+23w41a --- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 57ad480..3eabf19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2-rc1 -yarn_mappings=1.20.2-rc1+build.2 -loader_version=0.14.22 +minecraft_version=23w41a +yarn_mappings=23w41a+build.2 +loader_version=0.14.23 # Mod Properties -mod_version=1.0.2+1.20.2-rc1-1.20.2-rc2 +mod_version=1.0.3+23w41a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.88.5+1.20.2 +fabric_version=0.90.1+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 849898d..1ce6b6b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,8 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.2-rc.1", - "1.20.2-rc.2" + "1.20.3-alpha.23.41.a" ], "java": ">=17", "fabric-api": "*" From 3dc94270f6eb2f937f9943f80db8720f77c4966e Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 18 Oct 2023 13:02:57 -0500 Subject: [PATCH 15/29] fix the new blocklist --- src/main/java/one/oth3r/sit/Events.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index ca13eb0..70a8540 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -84,8 +84,9 @@ public class Events { BlockState blockStateAbove = world.getBlockState(pos.add(0,1,0)); Block blockAbove = blockStateAbove.getBlock(); // todo strict checker option to check 2 blocks above?? - // set amount of blocks that can be above a chair - if (!(blockAbove instanceof SignBlock || blockAbove instanceof TrapdoorBlock || blockAbove instanceof BannerBlock)) return false; + // set amount of blocks that can be above a chair & air + if (!(blockAbove instanceof WallSignBlock || blockAbove instanceof TrapdoorBlock || + blockAbove instanceof WallBannerBlock || blockAbove instanceof AirBlock)) return false; //if there's already an entity at the block location or above it for (Entity entity:entities.values()) if (entity.getBlockPos().equals(pos) || entity.getBlockPos().add(0,1,0).equals(pos)) return false; // return for the 4 default types From 879f755f193e9e42bea3d34e68e721186a2e83a0 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 18 Oct 2023 13:04:37 -0500 Subject: [PATCH 16/29] s1.0.3+23w42a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3eabf19..e1ee6fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w41a -yarn_mappings=23w41a+build.2 +minecraft_version=23w42a +yarn_mappings=23w42a+build.1 loader_version=0.14.23 # Mod Properties -mod_version=1.0.3+23w41a +mod_version=s1.0.3+23w42a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.1+1.20.3 +fabric_version=0.90.3+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 1ce6b6b..3d88af4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.41.a" + "1.20.3-alpha.23.42.a" ], "java": ">=17", "fabric-api": "*" From a44a038feb6262827e0df09c7bc8d1d750922c69 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 25 Oct 2023 11:02:29 -0500 Subject: [PATCH 17/29] v1.0.3+23w43a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index e1ee6fc..5440342 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w42a -yarn_mappings=23w42a+build.1 +minecraft_version=23w43a +yarn_mappings=23w43a+build.1 loader_version=0.14.23 # Mod Properties -mod_version=s1.0.3+23w42a +mod_version=s1.0.3+23w43a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.3+1.20.3 +fabric_version=0.90.4+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3d88af4..83e2489 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.42.a" + "1.20.3-alpha.23.43.a" ], "java": ">=17", "fabric-api": "*" From 1b2adc2c7bff9bce554fe3c13f3e5a61777ee4c3 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Fri, 27 Oct 2023 09:38:44 -0500 Subject: [PATCH 18/29] v1.0.3+23w43b --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5440342..43038a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w43a -yarn_mappings=23w43a+build.1 +minecraft_version=23w43b +yarn_mappings=23w43b+build.1 loader_version=0.14.23 # Mod Properties -mod_version=s1.0.3+23w43a +mod_version=s1.0.3+23w43b maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.4+1.20.3 +fabric_version=0.90.5+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 83e2489..8e57f5c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.43.a" + "1.20.3-alpha.23.43.b" ], "java": ">=17", "fabric-api": "*" From 483255fe017cd74088edca2e3ca553c82b45194b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 1 Nov 2023 14:15:46 -0500 Subject: [PATCH 19/29] s1.0.3+23w44a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 43038a6..b562038 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w43b -yarn_mappings=23w43b+build.1 +minecraft_version=23w44a +yarn_mappings=23w44a+build.1 loader_version=0.14.23 # Mod Properties -mod_version=s1.0.3+23w43b +mod_version=s1.0.3+23w44a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.5+1.20.3 +fabric_version=0.90.6+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8e57f5c..f0978fb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.43.b" + "1.20.3-alpha.23.44.a" ], "java": ">=17", "fabric-api": "*" From 601fca3269e697ea0eb360ec4dd413a14bd80d3b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 8 Nov 2023 14:01:09 -0600 Subject: [PATCH 20/29] s1.0.3+23w45a --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b562038..112d26a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w44a -yarn_mappings=23w44a+build.1 +minecraft_version=23w45a +yarn_mappings=23w45a+build.1 loader_version=0.14.23 # Mod Properties -mod_version=s1.0.3+23w44a +mod_version=s1.0.3+23w45a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.6+1.20.3 +fabric_version=0.90.8+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f0978fb..2ec2165 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.44.a" + "1.20.3-alpha.23.45.a" ], "java": ">=17", "fabric-api": "*" From 87e293d1d2982b557b8ce3a949ce98aafa00379a Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 16 Nov 2023 18:10:53 -0600 Subject: [PATCH 21/29] s1.0.3+23w46a --- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 112d26a..a103cb7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w45a -yarn_mappings=23w45a+build.1 -loader_version=0.14.23 +minecraft_version=23w46a +yarn_mappings=23w46a+build.1 +loader_version=0.14.24 # Mod Properties -mod_version=s1.0.3+23w45a +mod_version=s1.0.3+23w46a maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.8+1.20.3 +fabric_version=0.90.9+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2ec2165..e26c7d2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.45.a" + "1.20.3-alpha.23.46.a" ], "java": ">=17", "fabric-api": "*" From eb3e10f73811adbc9afcefe177179e96eb5fa04a Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 20 Nov 2023 12:10:38 -0600 Subject: [PATCH 22/29] s1.0.3+1.20.3-pre1 --- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a103cb7..14c1777 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,16 +4,16 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=23w46a -yarn_mappings=23w46a+build.1 +minecraft_version=1.20.3-pre1 +yarn_mappings=1.20.3-pre1+build.1 loader_version=0.14.24 # Mod Properties -mod_version=s1.0.3+23w46a +mod_version=s1.0.3+1.20.3-pre1 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.9+1.20.3 +fabric_version=0.90.11+1.20.3 modmenu_version=7.0.0 yacl_version=3.0.0+1.20 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e26c7d2..8a9783f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - "1.20.3-alpha.23.46.a" + "1.20.3-beta.1" ], "java": ">=17", "fabric-api": "*" From 021f97974905b0563f7ccafbb793dcb6ed9ff942 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 30 Nov 2023 18:12:37 -0600 Subject: [PATCH 23/29] -modmenu --- src/main/java/one/oth3r/sit/ModMenu.java | 196 ----------------------- 1 file changed, 196 deletions(-) delete mode 100644 src/main/java/one/oth3r/sit/ModMenu.java diff --git a/src/main/java/one/oth3r/sit/ModMenu.java b/src/main/java/one/oth3r/sit/ModMenu.java deleted file mode 100644 index 2d6e6ec..0000000 --- a/src/main/java/one/oth3r/sit/ModMenu.java +++ /dev/null @@ -1,196 +0,0 @@ -//package one.oth3r.sit; -// -//import com.terraformersmc.modmenu.api.ConfigScreenFactory; -//import com.terraformersmc.modmenu.api.ModMenuApi; -//import dev.isxander.yacl3.api.*; -//import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; -//import dev.isxander.yacl3.api.controller.EnumControllerBuilder; -//import dev.isxander.yacl3.api.controller.StringControllerBuilder; -//import net.minecraft.text.MutableText; -//import net.minecraft.text.Text; -//import net.minecraft.text.TextColor; -//import net.minecraft.util.Formatting; -// -//public class ModMenu implements ModMenuApi { -// private static MutableText lang(String key) { -// return Text.translatable("config.sit."+key); -// } -// private static MutableText lang(String key, Object... args) { -// return Text.translatable("config.sit."+key,args); -// } -// @Override -// public ConfigScreenFactory getModConfigScreenFactory() { -// return parent -> YetAnotherConfigLib.createBuilder().save(config::save) -// .title(Text.of("Sit!")) -// .category(ConfigCategory.createBuilder() -// .name(lang("category.general")) -// .tooltip(lang("category.general.tooltip")) -// .option(Option.createBuilder() -// .name(lang("general.keep_active")) -// .description(OptionDescription.of(lang("general.keep_active.description"))) -// .binding(config.defaults.keepActive, () -> config.keepActive, n -> config.keepActive = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("general.sit_while_seated")) -// .description(OptionDescription.of(lang("general.sit_while_seated.description"))) -// .binding(config.defaults.sitWhileSeated, () -> config.sitWhileSeated, n -> config.sitWhileSeated = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .group(OptionGroup.createBuilder() -// .name(lang("general.sittable")) -// .description(OptionDescription.of(lang("general.sittable.description"))) -// .option(Option.createBuilder() -// .name(lang("general.sittable.stairs")) -// .binding(config.defaults.stairsOn, () -> config.stairsOn, n -> config.stairsOn = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("general.sittable.slabs")) -// .binding(config.defaults.slabsOn, () -> config.slabsOn, n -> config.slabsOn = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("general.sittable.carpets")) -// .binding(config.defaults.carpetsOn, () -> config.carpetsOn, n -> config.carpetsOn = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("general.sittable.full_blocks")) -// .binding(config.defaults.fullBlocksOn, () -> config.fullBlocksOn, n -> config.fullBlocksOn = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("general.sittable.custom")) -// .description(OptionDescription.of(lang("general.sittable.custom.description"))) -// .binding(config.defaults.customOn, () -> config.customOn, n -> config.customOn = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter()) -// .build()) -// .build()) -// .group(ListOption.createBuilder() -// .name(lang("general.sittable_blocks")) -// .description(OptionDescription.of( -// lang("general.sittable_blocks.description") -// .append("\n\n").append(lang("general.sittable_blocks.description_2")) -// .append(lang("general.sittable_blocks.description_3", -// lang("general.sittable_blocks.description_3_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))), -// lang("general.sittable_blocks.description_3_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))), -// lang("general.sittable_blocks.description_3_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))), -// lang("general.sittable_blocks.description_3_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))) -// .append("\n\n").append(lang("general.sittable_blocks.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) -// .append("\n").append(lang("general.sittable_blocks.description_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))) -// .append("\n").append(lang("general.sittable_blocks.description_6").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) -// .append("\n").append(lang("general.sittable_blocks.description_7").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))) -// .append("\n\n").append(lang("general.sittable_blocks.description_8").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.YELLOW)))))) -// .binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n) -// .controller(StringControllerBuilder::create) -// .initial("") -// .build()) -// .build()) -// .category(ConfigCategory.createBuilder() -// .name(lang("category.main_hand")) -// .tooltip(lang("category.main_hand.tooltip")) -// .option(Option.createBuilder() -// .name(lang("hand.requirements")) -// .description(OptionDescription.of(lang("hand.requirements.description") -// .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) -// .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) -// .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) -// .binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n) -// .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) -// .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) -// .build()) -// .group(OptionGroup.createBuilder() -// .name(lang("hand.restrictions")) -// .description(OptionDescription.of(lang("hand.restrictions.description"))) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.blocks")) -// .binding(config.defaults.mainBlock,()-> config.mainBlock,n -> config.mainBlock = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.food")) -// .binding(config.defaults.mainFood,()-> config.mainFood,n -> config.mainFood = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.usable")) -// .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) -// .binding(config.defaults.mainUsable,()-> config.mainUsable,n -> config.mainUsable = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .build()) -// .group(ListOption.createBuilder() -// .name(lang("hand.whitelist")) -// .description(OptionDescription.of(lang("hand.whitelist.description") -// .append("\n\n").append(lang("hand.list.description")) -// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) -// .binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n) -// .controller(StringControllerBuilder::create) -// .initial("") -// .build()) -// .group(ListOption.createBuilder() -// .name(lang("hand.blacklist")) -// .description(OptionDescription.of(lang("hand.blacklist.description") -// .append("\n\n").append(lang("hand.list.description")) -// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) -// .binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n) -// .controller(StringControllerBuilder::create) -// .initial("") -// .build()) -// .build()) -// .category(ConfigCategory.createBuilder() -// .name(lang("category.off_hand")) -// .tooltip(lang("category.off_hand.tooltip")) -// .option(Option.createBuilder() -// .name(lang("hand.requirements")) -// .description(OptionDescription.of(lang("hand.requirements.description") -// .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) -// .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) -// .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) -// .binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n) -// .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) -// .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) -// .build()) -// .group(OptionGroup.createBuilder() -// .name(lang("hand.restrictions")) -// .description(OptionDescription.of(lang("hand.restrictions.description"))) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.blocks")) -// .binding(config.defaults.offBlock,()-> config.offBlock,n -> config.offBlock = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.food")) -// .binding(config.defaults.offFood,()-> config.offFood,n -> config.offFood = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .option(Option.createBuilder() -// .name(lang("hand.restrictions.usable")) -// .description(OptionDescription.of(lang("hand.restrictions.usable.description"))) -// .binding(config.defaults.offUsable,()-> config.offUsable,n -> config.offUsable = n) -// .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter()) -// .build()) -// .build()) -// .group(ListOption.createBuilder() -// .name(lang("hand.whitelist")) -// .description(OptionDescription.of(lang("hand.whitelist.description") -// .append("\n\n").append(lang("hand.list.description")) -// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) -// .binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n) -// .controller(StringControllerBuilder::create) -// .initial("") -// .build()) -// .group(ListOption.createBuilder() -// .name(lang("hand.blacklist")) -// .description(OptionDescription.of(lang("hand.blacklist.description") -// .append("\n\n").append(lang("hand.list.description")) -// .append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) -// .binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n) -// .controller(StringControllerBuilder::create) -// .initial("") -// .build()) -// .build()) -// .build().generateScreen(parent); -// } -//} From 90422345bc23f91068dbc6028de12c05d0c9dfdf Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 30 Nov 2023 18:13:20 -0600 Subject: [PATCH 24/29] s1.1.0+1.20.3-pre1-1.20.3-rc1 --- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index c38bb12..46c5a1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.3-pre1 -yarn_mappings=1.20.3-pre1+build.1 -loader_version=0.14.24 +minecraft_version=1.20.3-rc1 +yarn_mappings=1.20.3-rc1+build.2 +loader_version=0.15.0 # Mod Properties -mod_version=s1.0.3+1.20.3-pre1 +mod_version=s1.1.0+1.20.3-pre1-1.20.3-rc1 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.90.11+1.20.3 +fabric_version=0.91.1+1.20.3 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 18c0e3f..33424bb 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": [ - ">=1.20.3-beta.1" + ">=1.20.3-beta.1 <=1.20.3-rc.10" ], "java": ">=17", "fabric-api": "*" From 189ae2d2b587ebb06f286e634d77dac82960666f Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 22 Jan 2024 17:56:34 -0600 Subject: [PATCH 25/29] new packet system 1.20.5 --- .../java/one/oth3r/sit/PacketBuilder.java | 35 ------------------- src/main/java/one/oth3r/sit/Sit.java | 35 +++++++++++-------- src/main/java/one/oth3r/sit/SitClient.java | 8 +++-- 3 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/one/oth3r/sit/PacketBuilder.java diff --git a/src/main/java/one/oth3r/sit/PacketBuilder.java b/src/main/java/one/oth3r/sit/PacketBuilder.java deleted file mode 100644 index 6afb6cf..0000000 --- a/src/main/java/one/oth3r/sit/PacketBuilder.java +++ /dev/null @@ -1,35 +0,0 @@ -package one.oth3r.sit; - -import io.netty.buffer.ByteBuf; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Identifier; - -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; - -public class PacketBuilder { - public static final String SETTINGS = "settings_v1.0"; - private final String message; - private final PacketByteBuf packetByteBuf = PacketByteBufs.create(); - public PacketBuilder(ByteBuf buf) { - // Read any data sent in the packet - message = buf.toString(StandardCharsets.UTF_8); - packetByteBuf.writeBytes(buf); - } - public PacketBuilder(String message) { - this.message = message; - packetByteBuf.writeBytes(ByteBuffer.wrap(message.getBytes(StandardCharsets.UTF_8)).array()); - } - public static Identifier getIdentifier() { - // only 1 packet rn - return new Identifier(Sit.MOD_ID, SETTINGS); - } - public void send() { - ClientPlayNetworking.send(getIdentifier(), packetByteBuf); - } - public String getMessage() { - return this.message; - } -} diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index 08abcc9..baeafa1 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -3,23 +3,24 @@ package one.oth3r.sit; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import io.netty.buffer.ByteBuf; -import io.netty.util.ReferenceCountUtil; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.MutableText; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; import java.util.HashMap; public class Sit implements ModInitializer { @@ -39,16 +40,22 @@ public class Sit implements ModInitializer { config.load(); Events.register(); //PACKETS - ServerPlayNetworking.registerGlobalReceiver(PacketBuilder.getIdentifier(), - (server, player, handler, buf, responseSender) -> { - // copy to not throw errors - PacketBuilder packet = new PacketBuilder(buf.copy()); + PayloadTypeRegistry.playC2S().register(SettingsPayload.ID, SettingsPayload.CODEC); + ServerPlayNetworking.registerGlobalReceiver(SettingsPayload.ID,((payload, context) -> { server.execute(() -> { - Type hashMapToken = new TypeToken>() {}.getType(); - Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - playerSettings.put(player,gson.fromJson(packet.getMessage(),hashMapToken)); - }); - }); + Type hashMapToken = new TypeToken>() {}.getType(); + Gson gson = new GsonBuilder().disableHtmlEscaping().create(); + playerSettings.put(context.player(),gson.fromJson(payload.value,hashMapToken)); + }); + })); + } + public record SettingsPayload(String value) implements CustomPayload { + public static final CustomPayload.Id ID = new CustomPayload.Id<>(new Identifier(MOD_ID,"settings_v1.1")); + public static final PacketCodec CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast(); + @Override + public Id getId() { + return ID; + } } public static MutableText lang(String key, Object... args) { if (isClient) return Text.translatable(key, args); diff --git a/src/main/java/one/oth3r/sit/SitClient.java b/src/main/java/one/oth3r/sit/SitClient.java index 2a1d2e1..555bd09 100644 --- a/src/main/java/one/oth3r/sit/SitClient.java +++ b/src/main/java/one/oth3r/sit/SitClient.java @@ -4,6 +4,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.network.packet.CustomPayload; public class SitClient implements ClientModInitializer { public static boolean inGame = false; @@ -13,13 +15,13 @@ public class SitClient implements ClientModInitializer { ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { inGame = true; // send a data packet whenever joining a server - client.execute(SitClient::sendPackets); + ClientPlayNetworking.send(sendPackets()); }); // reset inGame ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> inGame = false); } - public static void sendPackets() { + public static CustomPayload sendPackets() { Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - new PacketBuilder(gson.toJson(Utl.getHandSettings())).send(); + return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings())); } } From aac7476f52e622c2bf5068d863353945138bb6f2 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Mon, 22 Jan 2024 17:57:18 -0600 Subject: [PATCH 26/29] s1.1.3+24w03b --- build.gradle | 2 +- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index eea3b51..5b01c78 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.5-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 4e0f13e..f831f31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.1 -loader_version=0.15.0 +minecraft_version=24w03b +yarn_mappings=24w03b+build.6 +loader_version=0.15.6 # Mod Properties -mod_version=1.1.3+1.20.2-1.20.4 +mod_version=s1.1.3+24w03b maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.91.1+1.20.3 +fabric_version=0.95.1+1.20.5 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 40b8217..15e55ca 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": ">=1.20.2 <=1.20.4", + "minecraft": ">=1.20.5-alpha.24.3.a", "java": ">=17", "fabric-api": "*" }, From d61031b8215bf03d0cf799e168aac166a118865b Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 10 Apr 2024 14:05:36 -0500 Subject: [PATCH 27/29] fix merge errors --- src/main/java/one/oth3r/sit/Sit.java | 1 + src/main/java/one/oth3r/sit/SitClient.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/one/oth3r/sit/Sit.java b/src/main/java/one/oth3r/sit/Sit.java index 3851da8..7ba996d 100644 --- a/src/main/java/one/oth3r/sit/Sit.java +++ b/src/main/java/one/oth3r/sit/Sit.java @@ -16,6 +16,7 @@ import net.minecraft.server.command.CommandManager; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.MutableText; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import one.oth3r.sit.file.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/one/oth3r/sit/SitClient.java b/src/main/java/one/oth3r/sit/SitClient.java index 555bd09..d1404ac 100644 --- a/src/main/java/one/oth3r/sit/SitClient.java +++ b/src/main/java/one/oth3r/sit/SitClient.java @@ -22,6 +22,6 @@ public class SitClient implements ClientModInitializer { } public static CustomPayload sendPackets() { Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings())); + return new Sit.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings())); } } From 28a46e9743603235291bfc8bb2bda86a86af65a9 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 10 Apr 2024 14:05:42 -0500 Subject: [PATCH 28/29] remove modmenu --- src/main/java/one/oth3r/sit/ModMenu.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/java/one/oth3r/sit/ModMenu.java diff --git a/src/main/java/one/oth3r/sit/ModMenu.java b/src/main/java/one/oth3r/sit/ModMenu.java deleted file mode 100644 index e69de29..0000000 From 6da67e67b000d76837d53707f85a35cecc4e9622 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 10 Apr 2024 14:06:33 -0500 Subject: [PATCH 29/29] v1.1.4+1.20.5-pre1 --- build.gradle | 2 +- gradle.properties | 10 +++++----- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5b01c78..2681614 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 5990aa3..d597697 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=24w03b -yarn_mappings=24w03b+build.6 -loader_version=0.15.6 +minecraft_version=1.20.5-pre1 +yarn_mappings=1.20.5-pre1+build.3 +loader_version=0.15.9 # Mod Properties -mod_version=s1.1.4+24w03b +mod_version=s1.1.4+1.20.5-pre1 maven_group=one.oth3r archives_base_name=sit! # Dependencies -fabric_version=0.95.1+1.20.5 +fabric_version=0.96.15+1.20.5 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 15e55ca..01eeac2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,7 +24,7 @@ }, "depends": { "fabricloader": ">=0.14.21", - "minecraft": ">=1.20.5-alpha.24.3.a", + "minecraft": ">=1.20.5-beta.1", "java": ">=17", "fabric-api": "*" },