From 3ab20c3200bd348869ba516152459cddfc8e8d52 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sat, 21 Mar 2020 12:31:49 -0400 Subject: [PATCH] Port to 1.15.2 --- CHANGELOG.md | 4 +++ README.md | 4 +-- build.gradle | 2 +- gradle.properties | 12 ++++----- .../slightlyvanilla/ModConfig.java | 2 -- .../slightlyvanilla/SlightlyVanilla.java | 11 +++----- .../entity/SlimeballEntity.java | 3 +-- .../entity/SpawnEggEntity.java | 3 +-- .../MixinNetherPortalBlockAreaHelper.java | 25 ------------------- .../mixin/MixinRespawnAnchorBlock.java | 22 ---------------- .../assets/slightlyvanilla/lang/en_us.json | 2 -- .../tags/blocks/extra_portal_blocks.json | 6 ----- src/main/resources/fabric.mod.json | 2 +- .../resources/slightlyvanilla.mixins.json | 2 -- 14 files changed, 19 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinNetherPortalBlockAreaHelper.java delete mode 100644 src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java delete mode 100644 src/main/resources/data/slightlyvanilla/tags/blocks/extra_portal_blocks.json diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c1aa3..89e7940 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +**1.15.2 Port** +* Remove Crying Obsidian Nether Portal +* Remove Use Respawn Anchor In Any Dimension + **1.0.9** * Disable Instant Nether Portal In Creative diff --git a/README.md b/README.md index 9947adb..0a2dd93 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # SlightlyVanilla +**1.15.2 Port** + A Collection of Tweaks for Vanilla Minecraft All tweaks can be enabled/disabled individually. Suggest more tweaks in the issue tracker! ## Tweaks -* Use Respawn Anchor in Any Dimension * Instant Kill In Creative Mode * Throwable Slimeballs * Throwable Spawn Eggs * Open Loot Chests In Spectator Mode -* Crying Obsidian Nether Portal * Allow Leashing Villagers * Disable Instant Nether Portal In Creative diff --git a/build.gradle b/build.gradle index f0de6fd..6b5321c 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,7 @@ if (project.hasProperty('curseforge.api_key')) { apiKey = project.getProperty('curseforge.api_key') project { id = project.curseforge_id - changelog = 'A changelog can be found at https://gitea.thebrokenrail.com/TheBrokenRail/SlightlyVanilla/src/branch/master/CHANGELOG.md' + changelog = 'A changelog can be found at https://gitea.thebrokenrail.com/TheBrokenRail/SlightlyVanilla/src/branch/1.15/CHANGELOG.md' releaseType = 'release' addGameVersion project.simple_minecraft_version addGameVersion 'Fabric' diff --git a/gradle.properties b/gradle.properties index 6da063e..6140f9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version = 20w12a + minecraft_version = 1.15.2 curseforge_id = 368420 - simple_minecraft_version = 1.16-Snapshot - yarn_build = 18 + simple_minecraft_version = 1.15.2 + yarn_build = 14 fabric_loader_version = 0.7.8+build.189 # Mod Properties @@ -16,7 +16,7 @@ org.gradle.jvmargs = -Xmx1G # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_api_version = 0.5.5+build.311-1.16 - cloth_config_version = 3.1.0-unstable + fabric_api_version = 0.5.1+build.294-1.15 + cloth_config_version = 2.9.3 auto_config_version = 1.2.4 - mod_menu_version = 1.11.0+build.2 + mod_menu_version = 1.10.2+build.32 diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java b/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java index 7d0a815..e06de83 100644 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java @@ -6,14 +6,12 @@ import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; @Config(name = SlightlyVanilla.NAMESPACE) public class ModConfig implements ConfigData { - public boolean useRespawnAnchorInAnyDimension = true; public boolean instantKillInCreative = true; @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public ThrowableOption throwableSlimeballs = new ThrowableOption(true, true); @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public ThrowableOption throwableSpawnEggs = new ThrowableOption(true, false); public boolean openLootChestsInSpectatorMode = true; - public boolean cryingObsidianNetherPortal = true; public boolean allowLeashingVillagers = true; public boolean disableInstantNetherPortalInCreative = true; diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java b/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java index 4f978b0..d3990d1 100644 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java @@ -6,8 +6,6 @@ import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.entity.FabricEntityTypeBuilder; -import net.fabricmc.fabric.api.tag.TagRegistry; -import net.minecraft.block.Block; import net.minecraft.block.DispenserBlock; import net.minecraft.block.dispenser.ItemDispenserBehavior; import net.minecraft.block.dispenser.ProjectileDispenserBehavior; @@ -15,14 +13,13 @@ import net.minecraft.entity.EntityCategory; import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnType; +import net.minecraft.entity.projectile.Projectile; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.SpawnEggItem; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; -import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPointer; import net.minecraft.util.math.Direction; @@ -38,8 +35,6 @@ public class SlightlyVanilla implements ModInitializer { public static EntityType SLIMEBALL_ENTITY; public static EntityType SPAWN_EGG_ENTITY; - public static final Tag EXTRA_PORTAL_BLOCKS_TAG = TagRegistry.block(new Identifier(NAMESPACE, "extra_portal_blocks")); - public static ModConfig getConfig() { return AutoConfig.getConfigHolder(ModConfig.class).getConfig(); } @@ -58,7 +53,7 @@ public class SlightlyVanilla implements ModInitializer { if (getConfig().throwableSlimeballs.dispenser) { return new ProjectileDispenserBehavior() { @Override - protected ProjectileEntity createProjectile(World position, Position stack, ItemStack itemStack) { + protected Projectile createProjectile(World position, Position stack, ItemStack itemStack) { SlimeballEntity entity = new SlimeballEntity(position, stack.getX(), stack.getY(), stack.getZ()); entity.setItem(itemStack); return entity; @@ -74,7 +69,7 @@ public class SlightlyVanilla implements ModInitializer { if (getConfig().throwableSpawnEggs.dispenser) { return new ProjectileDispenserBehavior() { @Override - protected ProjectileEntity createProjectile(World position, Position stack, ItemStack itemStack) { + protected Projectile createProjectile(World position, Position stack, ItemStack itemStack) { SpawnEggEntity entity = new SpawnEggEntity(position, stack.getX(), stack.getY(), stack.getZ()); entity.setItem(itemStack); return entity; diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java index a8f5a12..0d036a1 100644 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java @@ -5,7 +5,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.entity.thrown.ThrownItemEntity; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.network.Packet; @@ -56,7 +56,6 @@ public class SlimeballEntity extends ThrownItemEntity { @Override protected void onCollision(HitResult hitResult) { - super.onCollision(hitResult); if (!world.isClient()) { world.sendEntityStatus(this, (byte) 3); remove(); diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SpawnEggEntity.java b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SpawnEggEntity.java index 0de221d..f45ea27 100644 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SpawnEggEntity.java +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SpawnEggEntity.java @@ -6,7 +6,7 @@ import net.fabricmc.api.Environment; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SpawnType; -import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.entity.thrown.ThrownItemEntity; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.item.SpawnEggItem; @@ -59,7 +59,6 @@ public class SpawnEggEntity extends ThrownItemEntity { @Override protected void onCollision(HitResult hitResult) { - super.onCollision(hitResult); if (!world.isClient()) { world.sendEntityStatus(this, (byte) 3); EntityType entityType = ((SpawnEggItem) getStack().getItem()).getEntityType(getStack().getTag()); diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinNetherPortalBlockAreaHelper.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinNetherPortalBlockAreaHelper.java deleted file mode 100644 index e0fc8c5..0000000 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinNetherPortalBlockAreaHelper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.thebrokenrail.slightlyvanilla.mixin; - -import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.NetherPortalBlock; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@SuppressWarnings("unused") -@Mixin(NetherPortalBlock.AreaHelper.class) -public class MixinNetherPortalBlockAreaHelper { - @SuppressWarnings("UnresolvedMixinReference") - @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;getBlock()Lnet/minecraft/block/Block;"), method = "*") - public Block redirectBlock(BlockState state) { - Block block = state.getBlock(); - if (block.isIn(SlightlyVanilla.EXTRA_PORTAL_BLOCKS_TAG) && SlightlyVanilla.getConfig().cryingObsidianNetherPortal) { - return Blocks.OBSIDIAN; - } else { - return block; - } - } -} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java deleted file mode 100644 index 9c331d5..0000000 --- a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thebrokenrail.slightlyvanilla.mixin; - -import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; -import net.minecraft.block.RespawnAnchorBlock; -import net.minecraft.world.dimension.Dimension; -import net.minecraft.world.dimension.DimensionType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@SuppressWarnings("unused") -@Mixin(RespawnAnchorBlock.class) -public class MixinRespawnAnchorBlock { - @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/dimension/Dimension;getType()Lnet/minecraft/world/dimension/DimensionType;", ordinal = 0), method = "onUse") - public DimensionType getDimension(Dimension dimension) { - if (SlightlyVanilla.getConfig().useRespawnAnchorInAnyDimension) { - return DimensionType.THE_NETHER; - } else { - return dimension.getType(); - } - } -} diff --git a/src/main/resources/assets/slightlyvanilla/lang/en_us.json b/src/main/resources/assets/slightlyvanilla/lang/en_us.json index 8bc83dc..d2d26bf 100644 --- a/src/main/resources/assets/slightlyvanilla/lang/en_us.json +++ b/src/main/resources/assets/slightlyvanilla/lang/en_us.json @@ -1,6 +1,5 @@ { "text.autoconfig.slightlyvanilla.title": "SlightlyVanilla Tweaks", - "text.autoconfig.slightlyvanilla.option.useRespawnAnchorInAnyDimension": "Use Respawn Anchor In Any Dimension", "text.autoconfig.slightlyvanilla.option.instantKillInCreative": "Instant Kill In Creative Mode", "text.autoconfig.slightlyvanilla.option.throwableSlimeballs": "Throwable Slimeballs", "text.autoconfig.slightlyvanilla.option.throwableSlimeballs.player": "Player", @@ -9,7 +8,6 @@ "text.autoconfig.slightlyvanilla.option.throwableSpawnEggs.player": "Player", "text.autoconfig.slightlyvanilla.option.throwableSpawnEggs.dispenser": "Dispenser", "text.autoconfig.slightlyvanilla.option.openLootChestsInSpectatorMode": "Open Loot Chests In Spectator Mode", - "text.autoconfig.slightlyvanilla.option.cryingObsidianNetherPortal": "Crying Obsidian Nether Portal", "text.autoconfig.slightlyvanilla.option.allowLeashingVillagers": "Allow Leashing Villagers", "text.autoconfig.slightlyvanilla.option.disableInstantNetherPortalInCreative": "Disable Instant Nether Portal In Creative", "entity.slightlyvanilla.slimeball": "Slimeball", diff --git a/src/main/resources/data/slightlyvanilla/tags/blocks/extra_portal_blocks.json b/src/main/resources/data/slightlyvanilla/tags/blocks/extra_portal_blocks.json deleted file mode 100644 index 05c5980..0000000 --- a/src/main/resources/data/slightlyvanilla/tags/blocks/extra_portal_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:crying_obsidian" - ] -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index af2c28d..29fe00e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,6 +32,6 @@ "depends": { "fabricloader": ">=0.7.4", "fabric": "*", - "minecraft": "1.16.x" + "minecraft": "1.15.x" } } diff --git a/src/main/resources/slightlyvanilla.mixins.json b/src/main/resources/slightlyvanilla.mixins.json index 9d8a8a5..773d720 100644 --- a/src/main/resources/slightlyvanilla.mixins.json +++ b/src/main/resources/slightlyvanilla.mixins.json @@ -6,12 +6,10 @@ "MixinClientPlayNetworkHandler" ], "mixins": [ - "MixinRespawnAnchorBlock", "MixinPlayerEntity", "MixinItem", "MixinSpawnEggItem", "MixinLootableContainerBlockEntity", - "MixinNetherPortalBlockAreaHelper", "MixinAbstractTraderEntity" ], "injectors": {