changed config

onysd128 · Jun 11, 2023 · db7afe6 · db7afe6
1 parent ae82be1
commit db7afe6
Show file tree

Hide file tree

Showing 18 changed files with 107 additions and 95 deletions.
diff --git a/src/main/java/com/mrcrayfish/vehicle/VehicleConfig.java b/src/main/java/com/mrcrayfish/vehicle/VehicleConfig.java
@@ -79,88 +79,97 @@ public static class Server
         @Config.RangeDouble(min = 0.0)
         public double fuelConsumptionFactor = 1.0;
 
-        @Config.Name("Aluminum Boat Key")
-        @Config.Comment("Depends on value will enable/disable key system for Aluminum Boat")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.aluminumBoatKey")
-        public boolean aluminumBoatKey = true;
-
-        @Config.Name("ATV Key")
-        @Config.Comment("Depends on value will enable/disable key system for ATV")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.atvKey")
-        public boolean atvKey = true;
-
-        @Config.Name("Bumper Car Key")
-        @Config.Comment("Depends on value will enable/disable key system for Bumper Car")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.bumperCarKey")
-        public boolean bumperCarKey = true;
-
-        @Config.Name("Dirt Bike Key")
-        @Config.Comment("Depends on value will enable/disable key system for Dirt Bike")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.dirtBikeKey")
-        public boolean dirtBikeKey = true;
-
-        @Config.Name("Go Kart Key")
-        @Config.Comment("Depends on value will enable/disable key system for Go Kart")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.goKartKey")
-        public boolean goKartKey = true;
-
-        @Config.Name("Golf Cart Key")
-        @Config.Comment("Depends on value will enable/disable key system for Golf Cart")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.golfCartKey")
-        public boolean golfCartKey = true;
-
-        @Config.Name("Jet Ski Key")
-        @Config.Comment("Depends on value will enable/disable key system for Jet Ski")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.jetSkiKey")
-        public boolean jetSkiKey = true;
-
-        @Config.Name("Lawn Mower Key")
-        @Config.Comment("Depends on value will enable/disable key system for Lawn Mower")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.lawnMowerKey")
-        public boolean lawnMowerKey = true;
-
-        @Config.Name("Mini Bike Key")
-        @Config.Comment("Depends on value will enable/disable key system for Mini Bike")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.miniBikeKey")
-        public boolean miniBikeKey = true;
-
-        @Config.Name("Mini Bus Key")
-        @Config.Comment("Depends on value will enable/disable key system for Mini Bus")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.miniBusKey")
-        public boolean miniBusKey = true;
-
-        @Config.Name("Moped Key")
-        @Config.Comment("Depends on value will enable/disable key system for Moped")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.mopedKey")
-        public boolean mopedKey = true;
-
-        @Config.Name("OffRoader Key")
-        @Config.Comment("Depends on value will enable/disable key system for OffRoader")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.offRoaderKey")
-        public boolean offRoaderKey = true;
-
-        @Config.Name("SmartCar Key")
-        @Config.Comment("Depends on value will enable/disable key system for SmartCar")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.smartCarKey")
-        public boolean smartCarKey = true;
-
-        @Config.Name("Speed Boat Key")
-        @Config.Comment("Depends on value will enable/disable key system for Speed Boat")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.speedBoatKey")
-        public boolean speedBoatKey = true;
-
-        @Config.Name("Sports Plane Key")
-        @Config.Comment("Depends on value will enable/disable key system for Sports Plane")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.sportsPlaneKey")
-        public boolean sportsPlaneKey = true;
-
-        @Config.Name("Tractor Key")
-        @Config.Comment("Depends on value will enable/disable key system for Tractor")
-        @Config.LangKey(Reference.MOD_ID + ".config.server.tractorKey")
-        public boolean tractorKey = true;
+        @Config.Name("Vehicles")
+        @Config.Comment("Config for separate vehicle")
+        @Config.LangKey(Reference.MOD_ID + ".config.server")
+        public final Vehicles VEHICLES = new Vehicles();
+
+        public class Vehicles{
+            @Config.Name("Aluminum Boat Key")
+            @Config.Comment("Depends on value will enable/disable key system for Aluminum Boat")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.aluminumBoatKey")
+            public boolean aluminumBoatKey = true;
+
+            @Config.Name("ATV Key")
+            @Config.Comment("Depends on value will enable/disable key system for ATV")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.atvKey")
+            public boolean atvKey = true;
+
+            @Config.Name("Bumper Car Key")
+            @Config.Comment("Depends on value will enable/disable key system for Bumper Car")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.bumperCarKey")
+            public boolean bumperCarKey = true;
+
+            @Config.Name("Dirt Bike Key")
+            @Config.Comment("Depends on value will enable/disable key system for Dirt Bike")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.dirtBikeKey")
+            public boolean dirtBikeKey = true;
+
+            @Config.Name("Go Kart Key")
+            @Config.Comment("Depends on value will enable/disable key system for Go Kart")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.goKartKey")
+            public boolean goKartKey = true;
+
+            @Config.Name("Golf Cart Key")
+            @Config.Comment("Depends on value will enable/disable key system for Golf Cart")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.golfCartKey")
+            public boolean golfCartKey = true;
+
+            @Config.Name("Jet Ski Key")
+            @Config.Comment("Depends on value will enable/disable key system for Jet Ski")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.jetSkiKey")
+            public boolean jetSkiKey = true;
+
+            @Config.Name("Lawn Mower Key")
+            @Config.Comment("Depends on value will enable/disable key system for Lawn Mower")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.lawnMowerKey")
+            public boolean lawnMowerKey = true;
+
+            @Config.Name("Mini Bike Key")
+            @Config.Comment("Depends on value will enable/disable key system for Mini Bike")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.miniBikeKey")
+            public boolean miniBikeKey = true;
+
+            @Config.Name("Mini Bus Key")
+            @Config.Comment("Depends on value will enable/disable key system for Mini Bus")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.miniBusKey")
+            public boolean miniBusKey = true;
+
+            @Config.Name("Moped Key")
+            @Config.Comment("Depends on value will enable/disable key system for Moped")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.mopedKey")
+            public boolean mopedKey = true;
+
+            @Config.Name("OffRoader Key")
+            @Config.Comment("Depends on value will enable/disable key system for OffRoader")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.offRoaderKey")
+            public boolean offRoaderKey = true;
+
+            @Config.Name("SmartCar Key")
+            @Config.Comment("Depends on value will enable/disable key system for SmartCar")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.smartCarKey")
+            public boolean smartCarKey = true;
+
+            @Config.Name("Speed Boat Key")
+            @Config.Comment("Depends on value will enable/disable key system for Speed Boat")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.speedBoatKey")
+            public boolean speedBoatKey = true;
+
+            @Config.Name("Sports Plane Key")
+            @Config.Comment("Depends on value will enable/disable key system for Sports Plane")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.sportsPlaneKey")
+            public boolean sportsPlaneKey = true;
+
+            @Config.Name("Tractor Key")
+            @Config.Comment("Depends on value will enable/disable key system for Tractor")
+            @Config.LangKey(Reference.MOD_ID + ".config.server.tractorKey")
+            public boolean tractorKey = true;
 
+        }
     }
 
+
+
     public static class Client
     {
         @Config.Name("Debug")

diff --git a/src/main/java/com/mrcrayfish/vehicle/common/CommonEvents.java b/src/main/java/com/mrcrayfish/vehicle/common/CommonEvents.java
@@ -15,6 +15,8 @@
 import com.mrcrayfish.vehicle.network.message.MessageThrowVehicle;
 import com.mrcrayfish.vehicle.tileentity.TileEntityGasPump;
 import com.mrcrayfish.vehicle.tileentity.TileEntityJack;
+import com.mrcrayfish.vehicle.util.CommonUtils;
+
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -114,6 +116,7 @@ public void onPlayerInteract(PlayerInteractEvent.EntityInteractSpecific event)
 
     public static boolean pickUpVehicle(World world, EntityPlayer player, EnumHand hand, Entity targetEntity)
     {
+        //CommonUtils.sendInfoMessage(player, targetEntity.getName());
         if(hand == EnumHand.MAIN_HAND && !world.isRemote && player.isSneaking() && !player.isSpectator() && VehicleConfig.SERVER.pickUpVehicles)
         {
             if(!HeldVehicleDataHandler.isHoldingVehicle(player))

diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityATV.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityATV.java
@@ -55,6 +55,6 @@ public boolean canTowTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.atvKey;            
+        return VehicleConfig.SERVER.VEHICLES.atvKey;            
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityAluminumBoat.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityAluminumBoat.java
@@ -28,7 +28,7 @@ public EntityAluminumBoat(World worldIn)
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.aluminumBoatKey;    
+        return VehicleConfig.SERVER.VEHICLES.aluminumBoatKey;    
     }
 
     @Override

diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityBumperCar.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityBumperCar.java
@@ -75,6 +75,6 @@ public boolean canBeColored()
     @Override
     public boolean isLockable()
     {   
-        return VehicleConfig.SERVER.bumperCarKey;          
+        return VehicleConfig.SERVER.VEHICLES.bumperCarKey;          
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityDirtBike.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityDirtBike.java
@@ -85,6 +85,6 @@ public FuelPort getFuelPort()
     @Override
     public boolean isLockable()
     { 
-        return VehicleConfig.SERVER.dirtBikeKey;
+        return VehicleConfig.SERVER.VEHICLES.dirtBikeKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityGoKart.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityGoKart.java
@@ -86,6 +86,6 @@ public boolean shouldRenderFuelPort()
     @Override
     public boolean isLockable()
     {    
-        return VehicleConfig.SERVER.goKartKey;
+        return VehicleConfig.SERVER.VEHICLES.goKartKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityGolfCart.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityGolfCart.java
@@ -64,6 +64,6 @@ public boolean canMountTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.golfCartKey;      
+        return VehicleConfig.SERVER.VEHICLES.golfCartKey;      
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityJetSki.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityJetSki.java
@@ -83,6 +83,6 @@ public boolean canBeColored()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.jetSkiKey;
+        return VehicleConfig.SERVER.VEHICLES.jetSkiKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityLawnMower.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityLawnMower.java
@@ -153,6 +153,6 @@ public boolean canTowTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.lawnMowerKey;
+        return VehicleConfig.SERVER.VEHICLES.lawnMowerKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMiniBike.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMiniBike.java
@@ -85,6 +85,6 @@ public boolean shouldRenderFuelPort()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.miniBikeKey;
+        return VehicleConfig.SERVER.VEHICLES.miniBikeKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMiniBus.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMiniBus.java
@@ -67,6 +67,6 @@ public boolean canTowTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.miniBusKey;
+        return VehicleConfig.SERVER.VEHICLES.miniBusKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMoped.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityMoped.java
@@ -304,6 +304,6 @@ public void removeChest()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.mopedKey;    
+        return VehicleConfig.SERVER.VEHICLES.mopedKey;    
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityOffRoader.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityOffRoader.java
@@ -66,6 +66,6 @@ public boolean canMountTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.offRoaderKey;      
+        return VehicleConfig.SERVER.VEHICLES.offRoaderKey;      
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySmartCar.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySmartCar.java
@@ -73,6 +73,6 @@ public boolean canMountTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.smartCarKey;
+        return VehicleConfig.SERVER.VEHICLES.smartCarKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySpeedBoat.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySpeedBoat.java
@@ -83,7 +83,7 @@ public boolean canBeColored()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.speedBoatKey;      
+        return VehicleConfig.SERVER.VEHICLES.speedBoatKey;      
     }
 
 

diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySportsPlane.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntitySportsPlane.java
@@ -110,6 +110,6 @@ public boolean canMountTrailer()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.sportsPlaneKey;
+        return VehicleConfig.SERVER.VEHICLES.sportsPlaneKey;
     }
 }
diff --git a/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityTractor.java b/src/main/java/com/mrcrayfish/vehicle/entity/vehicle/EntityTractor.java
@@ -92,6 +92,6 @@ public boolean canBeColored()
     @Override
     public boolean isLockable()
     {
-        return VehicleConfig.SERVER.tractorKey;
+        return VehicleConfig.SERVER.VEHICLES.tractorKey;
     }
 }