Skip to content

Commit 4d2970b

Browse files
committed
Formatting, cleanup
1 parent 215b195 commit 4d2970b

File tree

22 files changed

+143
-107
lines changed

22 files changed

+143
-107
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![Available for MC 1.12.2](https://img.shields.io/badge/Available%20for-MC%201.12.2-3498db.svg?labelColor=34495e&style=for-the-badge)
22
![License LGPL-3.0](https://img.shields.io/github/license/ACGaming/UniversalTweaks?labelColor=34495e&color=3498db&style=for-the-badge)
33
[![Stars](https://img.shields.io/github/stars/ACGaming/UniversalTweaks?labelColor=34495e&color=3498db&style=for-the-badge)](https://github.com/ACGaming/UniversalTweaks/stargazers)
4-
[![Superseded Mods](https://img.shields.io/badge/Superseded%20Mods-97-3498db.svg?labelColor=34495e&style=for-the-badge)](https://www.curseforge.com/minecraft/mc-mods/universal-tweaks/relations/dependencies?page=1&type=Incompatible)
4+
[![Superseded Mods](https://img.shields.io/badge/Superseded%20Mods-100+-3498db.svg?labelColor=34495e&style=for-the-badge)](https://www.curseforge.com/minecraft/mc-mods/universal-tweaks/relations/dependencies?page=1&type=Incompatible)
55

66
# UNIVERSAL TWEAKS
77

src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/arrow/mixin/UTEntityTippedArrowMixin.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package mod.acgaming.universaltweaks.bugfixes.entities.arrow.mixin;
22

3+
import java.util.Set;
4+
35
import net.minecraft.entity.projectile.EntityTippedArrow;
46
import net.minecraft.init.PotionTypes;
57
import net.minecraft.potion.PotionEffect;
68
import net.minecraft.potion.PotionType;
79

8-
import java.util.Set;
9-
1010
import mod.acgaming.universaltweaks.config.UTConfigBugfixes;
1111
import org.spongepowered.asm.mixin.Final;
1212
import org.spongepowered.asm.mixin.Mixin;
@@ -21,7 +21,7 @@
2121
public abstract class UTEntityTippedArrowMixin
2222
{
2323
@Shadow
24-
private PotionType potion;
24+
private PotionType potion;
2525
@Shadow
2626
@Final
2727
private Set<PotionEffect> customPotionEffects;

src/main/java/mod/acgaming/universaltweaks/bugfixes/entities/desync/IPrevMotion.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public interface IPrevMotion
1717

1818
/**
1919
* Checks if this entity has ever called super.onUpdate(). This should adequately determine if it should be ignored by the desync fix.
20+
*
2021
* @return true if the implementing class calls super.onUpdate()
2122
*/
2223
boolean hasSuperUpdate();

src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import net.minecraft.inventory.Slot;
55
import net.minecraft.inventory.SlotCrafting;
66
import net.minecraft.item.ItemStack;
7+
78
import mod.acgaming.universaltweaks.config.UTConfigBugfixes;
89
import org.spongepowered.asm.mixin.Mixin;
910
import org.spongepowered.asm.mixin.Shadow;

src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public static class EntitiesCategory
256256
@Config.Name("Skeleton Aim")
257257
@Config.Comment("Fixes skeletons not looking at their targets when strafing")
258258
public boolean utSkeletonAimToggle = true;
259-
259+
260260
@Config.RequiresMcRestart
261261
@Config.Name("Untipped Arrow Particles")
262262
@Config.Comment("Fixes untipped arrows emitting blue tipped arrow particles upon reloading a world")
@@ -308,7 +308,7 @@ public static class MiscCategory
308308
@Config.Name("Blast Protection Knockback")
309309
@Config.Comment("Fixes the blast protection enchantment not reducing knockback from explosions except at very high levels")
310310
public boolean utBlastProtectionKnockbackToggle = false;
311-
311+
312312
@Config.RequiresMcRestart
313313
@Config.Name("Crafted Item Statistics")
314314
@Config.Comment("Fixes crafted item statistics not increasing correctly when items are crafted with shift-click or drop methods")
@@ -337,7 +337,7 @@ public static class MiscCategory
337337
@Config.Name("Potion Amplifier Visibility")
338338
@Config.Comment("Fixes potion effects not displaying their level above 'IV'")
339339
public boolean utPotionAmplifierVisibilityToggle = true;
340-
340+
341341
@Config.RequiresMcRestart
342342
@Config.Name("Spectator Menu")
343343
@Config.Comment("Fixes the spectator menu not showing player skins")

src/main/java/mod/acgaming/universaltweaks/config/UTConfigTweaks.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ public static class MiscCategory
11981198
@Config.RequiresMcRestart
11991199
@Config.Name("Compact Messages")
12001200
@Config.Comment("Removes duplicate messages and instead put a number behind the message how often it was repeated")
1201-
public boolean utCompactMessagesToggle = true;
1201+
public boolean utCompactMessagesToggle = false;
12021202

12031203
@Config.RequiresMcRestart
12041204
@Config.Name("Linear XP Amount")

src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ public boolean shouldMixinConfigQueue(String mixinConfig)
258258
if (isDev)
259259
{
260260
// Causes crashes in dev env only
261-
if (mixinConfig.equals("mixins.tweaks.misc.armorcurve.json")) return false;
262-
return true;
261+
return !mixinConfig.equals("mixins.tweaks.misc.armorcurve.json");
263262
}
264263
if (isClient)
265264
{

src/main/java/mod/acgaming/universaltweaks/mods/cbmultipart/mixin/UTControlKeyValueMixin.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66

77
import codechicken.multipart.ControlKeyModifer;
88
import codechicken.multipart.ControlKeyModifer$;
9-
import org.spongepowered.asm.mixin.Final;
10-
import org.spongepowered.asm.mixin.Mixin;
11-
import org.spongepowered.asm.mixin.Mutable;
12-
import org.spongepowered.asm.mixin.Shadow;
13-
import org.spongepowered.asm.mixin.Unique;
9+
import org.spongepowered.asm.mixin.*;
1410
import org.spongepowered.asm.mixin.injection.At;
1511
import org.spongepowered.asm.mixin.injection.Inject;
1612
import org.spongepowered.asm.mixin.injection.ModifyArg;
1713
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1814

1915
// Courtesy of jchung01
16+
2017
/**
2118
* Note: To my knowledge, {@link ControlKeyModifer#isControlDown(EntityPlayer)} is never called in any mod, so this mixin isn't very useful.
2219
*/

src/main/java/mod/acgaming/universaltweaks/mods/compactmachines/mixin/UTCubeToolsMixin.java

+18-10
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,27 @@
1717

1818
// Courtesy of jchung01
1919
@Mixin(value = CubeTools.class, remap = false)
20-
public class UTCubeToolsMixin {
20+
public class UTCubeToolsMixin
21+
{
2122

2223
/**
2324
* Using a block's complete (x,y,z) position, determine the size of compact machine it belongs to.
2425
*
2526
* @param section the section of world, possibly a sub-chunk or chunk
26-
* @param pos the block pos, including its y dimension
27+
* @param pos the block pos, including its y dimension
2728
* @return the corresponding compact machine's interior size + 1
2829
*/
2930
@Unique
30-
private static int universalTweaks$getCubeSizeWithYContext(IBlockAccess section, MutableBlockPos pos) {
31+
private static int universalTweaks$getCubeSizeWithYContext(IBlockAccess section, MutableBlockPos pos)
32+
{
3133
pos.setPos(pos.getX() * 1024, pos.getY(), pos.getZ());
32-
for (int i = EnumMachineSize.values().length - 1; i >= 0; i--) {
34+
for (int i = EnumMachineSize.values().length - 1; i >= 0; i--)
35+
{
3336
EnumMachineSize size = EnumMachineSize.values()[i];
3437
// (x + dimension, y, z)
3538
pos.move(EnumFacing.EAST, size.getDimension());
36-
if (section.getBlockState(pos).getBlock() == Blockss.wall) {
39+
if (section.getBlockState(pos).getBlock() == Blockss.wall)
40+
{
3741
return size.getDimension();
3842
}
3943
// Reset to (x, y, z)
@@ -52,17 +56,21 @@ public class UTCubeToolsMixin {
5256
* to get block state info for the bottom sub-chunk of the machine, not the upper sub-chunk. This causes invisible walls for that upper sub-chunk.
5357
*
5458
* @param instance the EnumMachineSize instance
55-
* @param world the section of world, possibly a sub-chunk or chunk
56-
* @param pos the block pos
59+
* @param world the section of world, possibly a sub-chunk or chunk
60+
* @param pos the block pos
5761
* @return the corresponding compact machine's interior size + 1
5862
*/
5963
@Redirect(method = "shouldSideBeRendered", at = @At(value = "INVOKE", target = "Lorg/dave/compactmachines3/reference/EnumMachineSize;getDimension()I"))
60-
private static int utReassignSize(EnumMachineSize instance, IBlockAccess world, BlockPos pos) {
64+
private static int utReassignSize(EnumMachineSize instance, IBlockAccess world, BlockPos pos)
65+
{
6166
if (!UTConfigMods.COMPACT_MACHINES.utCMRenderFixToggle) return instance.getDimension();
6267
PooledMutableBlockPos mPos = PooledMutableBlockPos.retain(pos);
63-
try {
68+
try
69+
{
6470
return universalTweaks$getCubeSizeWithYContext(world, mPos.setPos(pos.getX() / 1024, pos.getY(), 0));
65-
} finally {
71+
}
72+
finally
73+
{
6674
// Have to manually release in 1.12
6775
mPos.release();
6876
}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
package mod.acgaming.universaltweaks.mods.effortlessbuilding.mixin;
22

3-
4-
import mod.acgaming.universaltweaks.config.UTConfigMods;
53
import net.minecraft.block.Block;
64
import net.minecraft.entity.player.EntityPlayer;
75
import net.minecraft.item.ItemStack;
6+
7+
import mod.acgaming.universaltweaks.config.UTConfigMods;
88
import nl.requios.effortlessbuilding.helper.InventoryHelper;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
1111
import org.spongepowered.asm.mixin.injection.Inject;
1212
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1313

1414
@Mixin(InventoryHelper.class)
15-
public class UTInventoryHelperMixin {
15+
public class UTInventoryHelperMixin
16+
{
1617

1718
@Inject(method = "findItemStackInInventory", at = @At("HEAD"), cancellable = true, remap = false)
18-
private static void utFindItemStackInInventory(EntityPlayer player, Block block, CallbackInfoReturnable<ItemStack> cir) {
19+
private static void utFindItemStackInInventory(EntityPlayer player, Block block, CallbackInfoReturnable<ItemStack> cir)
20+
{
1921
if (UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle) cir.setReturnValue(ItemStack.EMPTY);
2022
}
2123
}

src/main/java/mod/acgaming/universaltweaks/mods/effortlessbuilding/mixin/UTSurvivalHelperMixin.java

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mod.acgaming.universaltweaks.mods.effortlessbuilding.mixin;
22

3-
import mod.acgaming.universaltweaks.config.UTConfigMods;
43
import net.minecraft.block.state.IBlockState;
54
import net.minecraft.entity.player.EntityPlayer;
65
import net.minecraft.item.Item;
@@ -9,23 +8,29 @@
98
import net.minecraft.util.math.BlockPos;
109
import net.minecraft.util.math.Vec3d;
1110
import net.minecraft.world.World;
11+
12+
import mod.acgaming.universaltweaks.config.UTConfigMods;
1213
import nl.requios.effortlessbuilding.helper.SurvivalHelper;
1314
import org.spongepowered.asm.mixin.Mixin;
1415
import org.spongepowered.asm.mixin.injection.At;
1516
import org.spongepowered.asm.mixin.injection.Inject;
1617
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1718

1819
@Mixin(SurvivalHelper.class)
19-
public class UTSurvivalHelperMixin {
20+
public class UTSurvivalHelperMixin
21+
{
2022

2123
@Inject(method = "placeBlock", at = @At("HEAD"), remap = false, cancellable = true)
22-
private static void utPlaceBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState, ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck, boolean skipCollisionCheck, boolean playSound, CallbackInfoReturnable<Boolean> cir) {
24+
private static void utPlaceBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState, ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck, boolean skipCollisionCheck, boolean playSound, CallbackInfoReturnable<Boolean> cir)
25+
{
2326
if (!UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle) return;
2427
int meta = blockState.getBlock().damageDropped(blockState);
2528
origstack = ItemStack.EMPTY;
26-
for (int i = 0; i < player.inventory.mainInventory.size(); i++) {
29+
for (int i = 0; i < player.inventory.mainInventory.size(); i++)
30+
{
2731
ItemStack stack = player.inventory.mainInventory.get(i);
28-
if (stack.getItem().equals(Item.getItemFromBlock(blockState.getBlock())) && stack.getMetadata() == meta) {
32+
if (stack.getItem().equals(Item.getItemFromBlock(blockState.getBlock())) && stack.getMetadata() == meta)
33+
{
2934
origstack = stack;
3035
break;
3136
}

src/main/java/mod/acgaming/universaltweaks/mods/effortlessbuilding/mixin/UTUndoRedoMixin.java

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
package mod.acgaming.universaltweaks.mods.effortlessbuilding.mixin;
22

3-
import mod.acgaming.universaltweaks.config.UTConfigMods;
43
import net.minecraft.block.state.IBlockState;
54
import net.minecraft.entity.player.EntityPlayer;
65
import net.minecraft.item.Item;
76
import net.minecraft.item.ItemStack;
7+
8+
import mod.acgaming.universaltweaks.config.UTConfigMods;
89
import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
910
import org.spongepowered.asm.mixin.Mixin;
1011
import org.spongepowered.asm.mixin.injection.At;
1112
import org.spongepowered.asm.mixin.injection.Inject;
1213
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1314

1415
@Mixin(UndoRedo.class)
15-
public class UTUndoRedoMixin {
16+
public class UTUndoRedoMixin
17+
{
1618

17-
@Inject(method = "findItemStackInInventory", at = @At("HEAD"), cancellable = true, remap = false)
18-
private static void utFindItemStackInInventory(EntityPlayer player, IBlockState blockState, CallbackInfoReturnable<ItemStack> cir) {
19+
@Inject(method = "findItemStackInInventory", at = @At("HEAD"), cancellable = true, remap = false)
20+
private static void utFindItemStackInInventory(EntityPlayer player, IBlockState blockState, CallbackInfoReturnable<ItemStack> cir)
21+
{
1922
if (!UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle) return;
2023
int meta = blockState.getBlock().damageDropped(blockState);
2124
ItemStack stack = ItemStack.EMPTY;
22-
for (int i = 0; i < player.inventory.mainInventory.size(); i++) {
25+
for (int i = 0; i < player.inventory.mainInventory.size(); i++)
26+
{
2327
ItemStack stack1 = player.inventory.mainInventory.get(i);
24-
if (stack1.getItem().equals(Item.getItemFromBlock(blockState.getBlock())) && stack1.getMetadata() == meta) {
28+
if (stack1.getItem().equals(Item.getItemFromBlock(blockState.getBlock())) && stack1.getMetadata() == meta)
29+
{
2530
stack = stack1;
2631
break;
2732
}

src/main/java/mod/acgaming/universaltweaks/mods/thaumicwonders/mixin/UTItemVoidFortressArmorMixin.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package mod.acgaming.universaltweaks.mods.thaumicwonders.mixin;
22

3-
import net.minecraft.client.model.ModelBiped;
4-
53
import com.verdantartifice.thaumicwonders.client.renderers.models.gear.ModelVoidFortressArmor;
64
import com.verdantartifice.thaumicwonders.common.items.armor.ItemVoidFortressArmor;
75
import org.spongepowered.asm.mixin.Mixin;

src/main/java/mod/acgaming/universaltweaks/tweaks/items/parry/UTParry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
@Mod.EventBusSubscriber(modid = UniversalTweaks.MODID)
3838
public class UTParry
3939
{
40+
private static final List<EntityEntry> projectileList = new ArrayList<>();
4041
private static Enchantment enchantment;
4142
private static EnumEnchantmentType enchantmentTypeShield;
42-
private static final List<EntityEntry> projectileList = new ArrayList<>();
4343

4444
public static void initProjectileList()
4545
{

src/main/java/mod/acgaming/universaltweaks/tweaks/misc/advancements/mixin/UTAdvancementManagerMixin.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package mod.acgaming.universaltweaks.tweaks.misc.advancements.mixin;
22

3-
import mod.acgaming.universaltweaks.config.UTConfigTweaks;
43
import net.minecraft.advancements.AdvancementManager;
4+
5+
import mod.acgaming.universaltweaks.config.UTConfigTweaks;
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.injection.At;
78
import org.spongepowered.asm.mixin.injection.Inject;

0 commit comments

Comments
 (0)