Lombokify

src/main/java/com/paneedah/weaponlib/CustomArmor.java

@@ -1,4 +1,4 @@
 package com.paneedah.weaponlib;
 
 import com.paneedah.weaponlib.crafting.CraftingEntry;
 import com.paneedah.weaponlib.crafting.CraftingGroup;
@@ -6,6 +6,7 @@
 import com.paneedah.weaponlib.crafting.IModernCraftingRecipe;
 import com.paneedah.weaponlib.model.ModelBaseRendererWrapper;
 import com.paneedah.weaponlib.model.WrappableModel;
+import lombok.Getter;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBiped;
@@ -197,8 +198,8 @@
 
         public Builder withCompatibleAttachment(AttachmentCategory category, ModelBase attachmentModel, String textureName,
                                                 Consumer<ModelBase> positioner) {
-            ItemAttachment<CustomArmor> item = new ItemAttachment<CustomArmor>(category, attachmentModel, textureName, null);
-            compatibleAttachments.put(item, new CompatibleAttachment<CustomArmor>(item, positioner));
+            ItemAttachment<CustomArmor> item = new ItemAttachment<>(category, attachmentModel, textureName, null);
+            compatibleAttachments.put(item, new CompatibleAttachment<>(item, positioner));
             return this;
         }
 
@@ -233,7 +234,7 @@
 
         public void build(boolean isClient) {
 
 //            if(FMLCommonHandler.instance().getSide().isClient()) {
 //              try {
 //                  chestModel = (ModelBiped) Class.forName(modelClassName).newInstance();
 //              } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
@@ -420,7 +421,7 @@
 
     //private EntityEquipmentSlot slot;
     private boolean hasNightVision;
-    private boolean vignetteEnabled;
+    @Getter private boolean vignetteEnabled;
     private float exposureReductionFactor;
 
     private SoundEvent breathingSound;
@@ -429,12 +430,12 @@
     //private boolean shieldEnabled;
     private long shieldRegenerationTimeout = 1000;
     private double shieldRegenerationRate = 1.0; // restored shield capacity per sec
-    private double maxShieldCapacity;
+    @Getter private double maxShieldCapacity;
     private final String unlocalizedArmorSetName;
-    private double shieldIndicatorPositionX;
-    private double shieldIndicatorPositionY;
-    private double shieldIndicatorWidth;
-    private double shieldIndicatorHeight;
+    @Getter private double shieldIndicatorPositionX;
+    @Getter private double shieldIndicatorPositionY;
+    @Getter private double shieldIndicatorWidth;
+    @Getter private double shieldIndicatorHeight;
     private String shieldIndicatorMaskTextureName;
     private String shieldIndicatorProgressBarTextureName;
 
@@ -645,13 +646,9 @@
         return hasNightVision;
     }
 
-    public boolean isVignetteEnabled() {
-        return vignetteEnabled;
-    }
-
     @Override
     public Function<Float, Float> getAbsorbFunction(Spreadable spreadable) {
         return dose -> dose * (1f - exposureReductionFactor);
     }
 
     @Override
@@ -784,26 +781,6 @@
         }
     }
 
-    public double getMaxShieldCapacity() {
-        return maxShieldCapacity;
-    }
-
-    public double getShieldIndicatorPositionX() {
-        return shieldIndicatorPositionX;
-    }
-
-    public double getShieldIndicatorPositionY() {
-        return shieldIndicatorPositionY;
-    }
-
-    public double getShieldIndicatorWidth() {
-        return shieldIndicatorWidth;
-    }
-
-    public double getShieldIndicatorHeight() {
-        return shieldIndicatorHeight;
-    }
-
     @Override
     public CraftingEntry[] getModernRecipe() {
         return this.modernRecipe;

src/main/java/com/paneedah/weaponlib/ItemMagazine.java

@@ -1,5 +1,6 @@
 package com.paneedah.weaponlib;
 
+import lombok.Getter;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -64,10 +65,10 @@ protected ItemAttachment<Weapon> createAttachment(ModContext modContext) {
 
     private ModContext modContext;
 
-    private final int capacity;
-    private List<ItemBullet> compatibleBullets;
-    private SoundEvent reloadSound;
-    private SoundEvent unloadSound;
+    @Getter private final int capacity;
+    @Getter private List<ItemBullet> compatibleBullets;
+    @Getter private SoundEvent reloadSound;
+    @Getter private SoundEvent unloadSound;
 
     ItemMagazine(ModelBase model, String textureName, int capacity) {
         this(model, textureName, capacity, null, null);
@@ -103,22 +104,6 @@ public void onCreated(ItemStack stack, World world, EntityPlayer player) {
         initializeTag(stack, 0);
     }
 
-    public List<ItemBullet> getCompatibleBullets() {
-        return compatibleBullets;
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-    public SoundEvent getReloadSound() {
-        return reloadSound;
-    }
-
-    public SoundEvent getUnloadSound() {
-        return unloadSound;
-    }
-
     @Override
     public Part getRenderablePart() {
         return this;

src/main/java/com/paneedah/weaponlib/Tuple.java

@@ -1,5 +1,9 @@
 package com.paneedah.weaponlib;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter @Getter
 public final class Tuple<U, V> {
 
     private U u;
@@ -11,20 +15,4 @@ public Tuple(U u, V v) {
         this.v = v;
     }
 
-    public U getU() {
-        return u;
-    }
-
-    public void setU(U u) {
-        this.u = u;
-    }
-
-    public V getV() {
-        return v;
-    }
-
-    public void setV(V v) {
-        this.v = v;
-    }
-
 }

src/main/java/com/paneedah/weaponlib/Weapon.java

@@ -1,4 +1,4 @@
 package com.paneedah.weaponlib;
 
 import com.paneedah.mwc.network.messages.BlockHitMessage;
 import com.paneedah.weaponlib.animation.ScreenShakeAnimation;
@@ -14,6 +14,7 @@
 import com.paneedah.weaponlib.render.shells.ShellParticleSimulator.Shell.Type;
 import dev.redstudio.redcore.utils.DecimalUtils;
 import io.redstudioragnarok.redcore.vectors.Vector3F;
+import lombok.Getter;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.model.ModelBase;
@@ -114,7 +115,7 @@
         private CreativeTabs creativeTab;
         private WeaponRenderer renderer;
         //float zoom = Weapon.DEFAULT_ZOOM;
-        List<Integer> maxShots = new ArrayList<>();
+        @Getter List<Integer> maxShots = new ArrayList<>();
         String crosshair;
         String crosshairRunning;
         String crosshairZoomed;
@@ -149,7 +150,7 @@
         long pumpTimeoutMilliseconds;
         long burstTimeoutMilliseconds = Weapon.DEFAULT_BURST_TIMEOUT_MILLISECONDS;
 
-        private float inaccuracy = DEFAULT_INACCURACY;
+        @Getter private float inaccuracy = DEFAULT_INACCURACY;
 
         int pellets = 1;
 
@@ -163,15 +164,15 @@
 
         float flashIntensity = 0.2f;
 
         Supplier<Float> flashScale = () -> 1f;
 
         Supplier<Float> flashOffsetX = () -> 0f;
 
         Supplier<Float> flashOffsetY = () -> 0f;
 
         Supplier<Float> smokeOffsetX = () -> 0f;
 
         Supplier<Float> smokeOffsetY = () -> 0f;
 
         long unloadingTimeout = Weapon.DEFAULT_UNLOADING_TIMEOUT_TICKS;
 
@@ -218,11 +219,11 @@
         private float zoom;
 
 
         protected Pair<Double, Double> screenShakingParameters = new Pair<Double, Double>(100.0, 1.0);
 
         private boolean newSys = false;
 
-        private int[][] guiPositions = new int[][]{{-43, 86}, {97, 96}, {92, 34}, {14, -55}, {164, -26}, {145, 67}, {60, 110}, {0, -50}, {-100, -50}, {-29, 44}, {50, 100}};
+        @Getter private int[][] guiPositions = new int[][]{{-43, 86}, {97, 96}, {92, 34}, {14, -55}, {164, -26}, {145, 67}, {60, 110}, {0, -50}, {-100, -50}, {-29, 44}, {50, 100}};
 
 
         public Builder() {
@@ -256,22 +257,10 @@
             return this;
         }
 
-        public List<Integer> getMaxShots() {
-            return this.maxShots;
-        }
-
-        public int[][] getGUIPositions() {
-            return this.guiPositions;
-        }
-
         public float getFirerate() {
             return this.fireRate;
         }
 
-        public float getInaccuracy() {
-            return this.inaccuracy;
-        }
-
         public Builder hasFlashPedals() {
             this.hasFlashPedals = true;
             return this;
@@ -345,7 +334,7 @@
 
         public Builder withMaxShots(int... maxShots) {
             for (int m : maxShots) {
                 this.maxShots.add(m);
             }
             return this;
         }
@@ -777,7 +766,7 @@
         }
 
         public Builder withModernScreenShaking(double intensity, double speedModifier) {
             this.screenShakingParameters = new Pair<Double, Double>(intensity, speedModifier);
             return this;
         }
 
@@ -912,7 +901,7 @@
             }
 
             if (maxShots.isEmpty()) {
                 maxShots.add(Integer.MAX_VALUE);
             }
 
             Weapon weapon = new Weapon(this, modContext);
@@ -1022,24 +1011,24 @@
 
     public Builder builder;
 
-    private final ModContext modContext;
+    @Getter private final ModContext modContext;
 
-    private Vec3d muzzlePosition;
+    @Getter private Vec3d muzzlePosition;
 
     private CraftingEntry[] modernRecipe;
 
-    private SoundEvent shootSound;
-    private SoundEvent endOfShootSound;
-    private SoundEvent silencedShootSound;
-    private SoundEvent reloadSound;
-    private SoundEvent reloadIterationSound;
-    private SoundEvent inspectSound;
-    private SoundEvent drawSound;
-    private SoundEvent allReloadIterationsCompletedSound;
-    private SoundEvent unloadSound;
-    private SoundEvent ejectSpentRoundSound;
-    private SoundEvent burstShootSound;
-    private SoundEvent silencedBurstShootSound;
+    @Getter private SoundEvent shootSound;
+    @Getter private SoundEvent endOfShootSound;
+    @Getter private SoundEvent silencedShootSound;
+    @Getter private SoundEvent reloadSound;
+    @Getter private SoundEvent reloadIterationSound;
+    @Getter private SoundEvent inspectSound;
+    @Getter private SoundEvent drawSound;
+    @Getter private SoundEvent allReloadIterationsCompletedSound;
+    @Getter private SoundEvent unloadSound;
+    @Getter private SoundEvent ejectSpentRoundSound;
+    @Getter private SoundEvent burstShootSound;
+    @Getter private SoundEvent silencedBurstShootSound;
 
     public enum State {READY, SHOOTING, RELOAD_REQUESTED, RELOAD_CONFIRMED, UNLOAD_STARTED, UNLOAD_REQUESTED_FROM_SERVER, UNLOAD_CONFIRMED, PAUSED, MODIFYING, EJECT_SPENT_ROUND}
 
@@ -1071,59 +1060,6 @@
     }
 
 
-    public SoundEvent getShootSound() {
-        return shootSound;
-    }
-
-    public SoundEvent getBurstShootSound() {
-        return burstShootSound;
-    }
-
-    public SoundEvent getSilencedBurstShootSound() {
-        return silencedBurstShootSound;
-    }
-
-    public SoundEvent getEndOfShootSound() {
-        return endOfShootSound;
-    }
-
-    public SoundEvent getSilencedShootSound() {
-        return silencedShootSound;
-    }
-
-    public SoundEvent getReloadSound() {
-        return reloadSound;
-    }
-
-
-    public SoundEvent getReloadIterationSound() {
-        return reloadIterationSound;
-    }
-
-    public SoundEvent getInspectSound() {
-        return inspectSound;
-    }
-
-    public SoundEvent getDrawSound() {
-        return drawSound;
-    }
-
-    public SoundEvent getAllReloadIterationsCompletedSound() {
-        return allReloadIterationsCompletedSound;
-    }
-
-    public SoundEvent getUnloadSound() {
-        return unloadSound;
-    }
-
-    public SoundEvent getEjectSpentRoundSound() {
-        return ejectSpentRoundSound;
-    }
-
-    public Vec3d getMuzzlePosition() {
-        return this.muzzlePosition;
-    }
-
     @Override
     public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack itemStack) {
         return true;
@@ -1415,7 +1351,7 @@
         instance.setState(WeaponState.READY);
 
         instance.setRecoil(BalancePackManager.shouldChangeWeaponRecoil(instance.getWeapon()) ? (float) BalancePackManager.getNewWeaponRecoil(instance.getWeapon()) : builder.recoil);
         instance.setMaxShots(builder.maxShots.get(0));
 
         for (CompatibleAttachment<Weapon> compatibleAttachment : ((Weapon) itemStack.getItem()).getCompatibleAttachments().values()) {
             ItemAttachment<Weapon> attachment = compatibleAttachment.getAttachment();
@@ -1447,15 +1383,15 @@
         Iterator<Integer> it = maxShotsList.iterator();
         //  Iterator<Integer> it = builder.maxShots.iterator();
         while (it.hasNext()) {
             if (instance.getMaxShots() == it.next()) {
                 break;
             }
         }
 
         if (it.hasNext()) {
             result = it.next();
         } else {
             result = maxShotsList.get(0);
         }
 
         instance.setMaxShots(result);
@@ -1601,10 +1537,6 @@
         return BalancePackManager.shouldChangeWeaponRecoil(this) ? (float) BalancePackManager.getNewWeaponRecoil(this) : builder.recoil;
     }
 
-    public ModContext getModContext() {
-        return modContext;
-    }
-
     public float getShellCasingVerticalOffset() {
         return builder.shellCasingVerticalOffset;
     }