diff --git a/README.md b/README.md index 551e3b6e..2d151c6a 100644 --- a/README.md +++ b/README.md @@ -347,9 +347,6 @@ All changes are toggleable via config files. * **Downgrade Potion Recipes Log Level:** Downgrades the message when creating a potion recipe from info to a debug * **Forestry** * **Arborist Villager Trades:** Adds custom emerald to germling trades to the arborist villager - * **Disable Bee Damage Armor Bypass:** Disables damage caused by bees bypassing player armor - * **Duplication Fixes:** Fixes various duplication exploits - * **Replanting Cocoa Beans:** Allows Forestry farms to automatically replant cocoa beans * **HWYLA** * **Keybindings Fix:** Fixes crashes in all menus when changing HWYLA keybindings to unsupported values * **In Control!** diff --git a/gradle.properties b/gradle.properties index 938b1aa6..d5747f7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ modGroup = mod.acgaming.universaltweaks # Version of your mod. # This field can be left empty if you want your mod's version to be determined by the latest git tag instead. -modVersion = 1.13.0 +modVersion = 1.13.1 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version) includeMCVersionJar = false diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java index 50632ae8..c7e340fe 100644 --- a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java +++ b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java @@ -621,29 +621,10 @@ public static class ForestryCategory }) public String[] utFOArboristDeals = new String[] {}; - @Config.RequiresMcRestart - @Config.Name("Disable Bee Damage Armor Bypass") - @Config.Comment("Disables damage caused by bees bypassing player armor") - public boolean utFOBeeDamageArmorBypassToggle = true; - @Config.RequiresMcRestart @Config.Name("Extra Trees: Gather Windfall") @Config.Comment("Allows Forestry farms to pick up ExtraTrees fruit") public boolean utFOGatherWindfallToggle = true; - - @Config.RequiresMcRestart - @Config.Name("Replanting Cocoa Beans") - @Config.Comment("Allows Forestry farms to automatically replant cocoa beans") - public boolean utFOCocoaBeansToggle = true; - - @Config.RequiresMcRestart - @Config.Name("Duplication Fixes") - @Config.Comment("Fixes various duplication exploits") - public boolean utDuplicationFixesToggle = true; - - @Config.Name("Particle Fixes") - @Config.Comment("Fixes broken textures for various running and landing particles") - public boolean utParticleFixesToggle = true; } public static class InControlCategory diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java index 466a9738..9258feb2 100644 --- a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java +++ b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java @@ -72,8 +72,6 @@ public class UTMixinLoader implements ILateMixinLoader put("mixins.mods.extrautilities.mutabledrops.json", () -> loaded("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utMutableBlockDrops); put("mixins.mods.extrautilities.potionlogging.json", () -> loaded("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDowngradePotionLogging); put("mixins.mods.extrautilities.radar.json", () -> loaded("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utCatchRadarException); - put("mixins.mods.forestry.cocoa.json", () -> loaded("forestry") && UTConfigMods.FORESTRY.utFOCocoaBeansToggle); - put("mixins.mods.forestry.dupes.json", () -> loaded("forestry") && UTConfigMods.FORESTRY.utDuplicationFixesToggle); put("mixins.mods.forestry.extratrees.json", () -> loaded("extratrees")); put("mixins.mods.forestry.json", () -> loaded("forestry")); put("mixins.mods.incontrol.json", () -> loaded("incontrol") && UTConfigMods.INCONTROL.utStatsFixToggle); diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/UTFarmableCocoa.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/UTFarmableCocoa.java deleted file mode 100644 index 3e6de0db..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/UTFarmableCocoa.java +++ /dev/null @@ -1,26 +0,0 @@ -package mod.acgaming.universaltweaks.mods.forestry; - -import net.minecraft.block.BlockCocoa; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import forestry.core.utils.BlockUtil; -import forestry.farming.logic.farmables.FarmableAgingCrop; -import forestry.farming.logic.farmables.FarmableCocoa; - -public class UTFarmableCocoa extends FarmableAgingCrop -{ - public UTFarmableCocoa() - { - super(new ItemStack(FarmableCocoa.COCOA_SEED, 1, 3), Blocks.COCOA, new ItemStack(FarmableCocoa.COCOA_SEED, 1, FarmableCocoa.COCOA_META), BlockCocoa.AGE, 2, 0); - } - - @Override - public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) - { - return BlockUtil.tryPlantCocoaPod(world, pos); - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTBaseBlockMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTBaseBlockMixin.java deleted file mode 100644 index 50491426..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTBaseBlockMixin.java +++ /dev/null @@ -1,78 +0,0 @@ -package mod.acgaming.universaltweaks.mods.forestry.mixin; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.ParticleDigging; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.core.blocks.BlockBase; -import forestry.core.blocks.IBlockType; -import forestry.core.blocks.IMachinePropertiesTesr; -import mod.acgaming.universaltweaks.config.UTConfigMods; -import mod.acgaming.universaltweaks.util.particle.UTParticleSituationEnum; -import mod.acgaming.universaltweaks.util.particle.UTParticleSpawnerMessage; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(BlockBase.class) -public abstract class UTBaseBlockMixin

& IBlockType & IStringSerializable> extends Block -{ - @Shadow(remap = false) - @Final - public P blockType; - - public UTBaseBlockMixin(Material materialIn) - { - super(materialIn); - } - - @Override - public boolean addLandingEffects(IBlockState state, WorldServer world, BlockPos pos, IBlockState unused, EntityLivingBase entity, int numberOfParticles) - { - if (!UTConfigMods.FORESTRY.utParticleFixesToggle) - { - return false; - } - UTParticleSpawnerMessage.send(world, EnumParticleTypes.BLOCK_DUST, UTParticleSituationEnum.FORESTRY, entity.posX, entity.posY, entity.posZ, 0.0D, 0.0D, 0.0D, 0.15D, numberOfParticles, getStateId(state)); - return true; - } - - @Override - public boolean addRunningEffects(IBlockState state, World world, BlockPos pos, Entity entity) - { - if (!UTConfigMods.FORESTRY.utParticleFixesToggle) - { - return false; - } - if (world.isRemote && this.blockType.getMachineProperties() instanceof IMachinePropertiesTesr) - { - addRunningEffectsOnClient(world, entity, state, (IMachinePropertiesTesr) this.blockType.getMachineProperties()); - } - return true; - } - - @SideOnly(Side.CLIENT) - private void addRunningEffectsOnClient(World world, Entity entity, IBlockState state, IMachinePropertiesTesr tesrProps) - { - Minecraft mc = Minecraft.getMinecraft(); - Random rand = world.rand; - ParticleManager effectRenderer = mc.effectRenderer; - ParticleDigging particle = (ParticleDigging) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_CRACK.getParticleID(), entity.posX + ((double) rand.nextFloat() - 0.5D) * (double) entity.width, entity.getEntityBoundingBox().minY + 0.1D, entity.posZ + ((double) rand.nextFloat() - 0.5D) * (double) entity.width, -entity.motionX * 4.0D, 1.5D, -entity.motionZ * 4.0D, new int[] {getStateId(state)}); - - particle.setParticleTexture(mc.modelManager.getTextureMap().getAtlasSprite(tesrProps.getParticleTextureLocation())); - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java deleted file mode 100644 index 7c7a6fb3..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTForestryDamageSourceMixin.java +++ /dev/null @@ -1,17 +0,0 @@ -package mod.acgaming.universaltweaks.mods.forestry.mixin; - -import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; -import forestry.core.utils.DamageSourceForestry; -import mod.acgaming.universaltweaks.config.UTConfigMods; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(DamageSourceForestry.class) -public class UTForestryDamageSourceMixin -{ - @WrapWithCondition(method = "", at = @At(value = "INVOKE", target = "Lforestry/core/utils/DamageSourceForestry;setDamageBypassesArmor()Lnet/minecraft/util/DamageSource;")) - public boolean utForestryDamageSource(DamageSourceForestry instance) - { - return !UTConfigMods.FORESTRY.utFOBeeDamageArmorBypassToggle; - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTItemInventoryBackpackMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTItemInventoryBackpackMixin.java deleted file mode 100644 index 44edadc8..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTItemInventoryBackpackMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package mod.acgaming.universaltweaks.mods.forestry.mixin; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import forestry.core.inventory.ItemInventory; -import forestry.storage.inventory.ItemInventoryBackpack; -import forestry.storage.items.ItemBackpack; -import org.spongepowered.asm.mixin.Mixin; - -// Courtesy of Focamacho -@Mixin(value = ItemInventoryBackpack.class, remap = false) -public abstract class UTItemInventoryBackpackMixin extends ItemInventory -{ - public UTItemInventoryBackpackMixin(EntityPlayer player, int size, ItemStack parent) - { - super(player, size, parent); - } - - @Override - public boolean isUsableByPlayer(EntityPlayer player) - { - return player.getHeldItemMainhand().getItem() instanceof ItemBackpack; - } -} \ No newline at end of file diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTMultiFarmCocoaMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTMultiFarmCocoaMixin.java deleted file mode 100644 index 0c0ef449..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/mods/forestry/mixin/UTMultiFarmCocoaMixin.java +++ /dev/null @@ -1,26 +0,0 @@ -package mod.acgaming.universaltweaks.mods.forestry.mixin; - -import forestry.api.farming.IFarmable; -import forestry.farming.logic.FarmLogicCocoa; -import mod.acgaming.universaltweaks.mods.forestry.UTFarmableCocoa; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(value = FarmLogicCocoa.class, remap = false) -public class UTMultiFarmCocoaMixin -{ - @Mutable - @Shadow - @Final - private IFarmable cocoa; - - @Redirect(method = "", at = @At(value = "FIELD", target = "Lforestry/farming/logic/FarmLogicCocoa;cocoa:Lforestry/api/farming/IFarmable;")) - public void utMultiFarmCocoa(FarmLogicCocoa instance, IFarmable value) - { - cocoa = new UTFarmableCocoa(); - } -} \ No newline at end of file diff --git a/src/main/resources/mixins.mods.forestry.cocoa.json b/src/main/resources/mixins.mods.forestry.cocoa.json deleted file mode 100644 index af632741..00000000 --- a/src/main/resources/mixins.mods.forestry.cocoa.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "package": "mod.acgaming.universaltweaks.mods.forestry.mixin", - "refmap": "universaltweaks.refmap.json", - "minVersion": "0.8", - "compatibilityLevel": "JAVA_8", - "mixins": ["UTMultiFarmCocoaMixin"] -} \ No newline at end of file diff --git a/src/main/resources/mixins.mods.forestry.dupes.json b/src/main/resources/mixins.mods.forestry.dupes.json deleted file mode 100644 index 739e3ab3..00000000 --- a/src/main/resources/mixins.mods.forestry.dupes.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "package": "mod.acgaming.universaltweaks.mods.forestry.mixin", - "refmap": "universaltweaks.refmap.json", - "minVersion": "0.8", - "compatibilityLevel": "JAVA_8", - "mixins": ["UTItemInventoryBackpackMixin"] -} \ No newline at end of file diff --git a/src/main/resources/mixins.mods.forestry.json b/src/main/resources/mixins.mods.forestry.json index eef97dff..d8e4d98f 100644 --- a/src/main/resources/mixins.mods.forestry.json +++ b/src/main/resources/mixins.mods.forestry.json @@ -3,5 +3,5 @@ "refmap": "universaltweaks.refmap.json", "minVersion": "0.8", "compatibilityLevel": "JAVA_8", - "mixins": ["UTBaseBlockMixin", "UTForestryDamageSourceMixin", "UTModuleArboricultureMixin"] + "mixins": ["UTModuleArboricultureMixin"] } \ No newline at end of file