fix camera dis-/mounting not working correctly and bump version

Geforce132 · May 19, 2020 · 8185fd7 · 8185fd7
1 parent aa680fb
commit 8185fd7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Changelog v1.8.x.md b/Changelog v1.8.x.md
@@ -1,9 +1,10 @@
---------------------------Changelog for v1.8.19 of SecurityCraft--------------------------
+--------------------------Changelog for v1.8.18.1 of SecurityCraft--------------------------
 
 - API: Option is now abstract and some methods have been changed around for cleaner code
 - Fix: Reinforced Levers etc. don't reliably open Reinforced Iron Doors etc. when powering a block next to them
 - Fix: New customizable options don't correctly load for existing blocks
 - Fix: Retinal Scanner crash
+- Fix: Camera dis-/mounting doesn't work correctly
 
 --------------------------Changelog for v1.8.18 of SecurityCraft--------------------------
 

diff --git a/build.gradle b/build.gradle
@@ -119,9 +119,9 @@ jar {
     manifest {
         attributes(["Specification-Title": "SecurityCraft",
                     "Specification-Vendor": "Geforce, bl4ckscor3",
-                    "Specification-Version": "v1.8.18",
+                    "Specification-Version": "v1.8.18.1",
                     "Implementation-Title": "SecurityCraft",
-                    "Implementation-Version": "v1.8.18",
+                    "Implementation-Version": "v1.8.18.1",
                     "Implementation-Vendor" :"Geforce, bl4ckscor3",
                     "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
     }

diff --git a/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java b/src/main/java/net/geforcemods/securitycraft/SecurityCraft.java
@@ -47,8 +47,8 @@
 @EventBusSubscriber(modid=SecurityCraft.MODID, bus=Bus.MOD)
 public class SecurityCraft {
 	public static final String MODID = "securitycraft";
-	//********************************* This is v1.8.18 for MC 1.15.2!
-	protected static final String VERSION = "v1.8.18";
+	//********************************* This is v1.8.18.1 for MC 1.15.2!
+	protected static final String VERSION = "v1.8.18.1";
 	public static IProxy proxy = DistExecutor.runForDist(() -> () -> new ClientProxy(), () -> () -> new ServerProxy());
 	public static SecurityCraft instance;
 	public static final String PROTOCOL_VERSION = "1.0";

diff --git a/src/main/java/net/geforcemods/securitycraft/blocks/SecurityCameraBlock.java b/src/main/java/net/geforcemods/securitycraft/blocks/SecurityCameraBlock.java
@@ -7,8 +7,8 @@
 import net.geforcemods.securitycraft.SCContent;
 import net.geforcemods.securitycraft.api.CustomizableTileEntity;
 import net.geforcemods.securitycraft.entity.SecurityCameraEntity;
-import net.geforcemods.securitycraft.misc.ModuleType;
 import net.geforcemods.securitycraft.misc.KeyBindings;
+import net.geforcemods.securitycraft.misc.ModuleType;
 import net.geforcemods.securitycraft.tileentity.SecurityCameraTileEntity;
 import net.geforcemods.securitycraft.util.BlockUtils;
 import net.geforcemods.securitycraft.util.ClientUtils;
@@ -121,7 +121,7 @@ public BlockState getStateForPlacement(World world, BlockPos pos, Direction faci
 	}
 
 	public void mountCamera(World world, int x, int y, int z, int id, PlayerEntity player){
-		if(!world.isRemote && player.getRidingEntity() == null)
+		if(world.isRemote && player.getRidingEntity() == null)
 			PlayerUtils.sendMessageToPlayer(player, ClientUtils.localize(SCContent.SECURITY_CAMERA.get().getTranslationKey()), ClientUtils.localize("messages.securitycraft:securityCamera.mounted").replace("#w", KeyBinding.getDisplayString("key.forward").get().toUpperCase()).replace("#a", KeyBinding.getDisplayString("key.left").get().toUpperCase()).replace("#s", KeyBinding.getDisplayString("key.back").get().toUpperCase()).replace("#d", KeyBinding.getDisplayString("key.right").get().toUpperCase()).replace("#i", KeyBindings.cameraZoomIn.getLocalizedName()).replace("#o", KeyBindings.cameraZoomOut.getLocalizedName()), TextFormatting.GREEN);
 
 		if(player.getRidingEntity() instanceof SecurityCameraEntity){

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -8,7 +8,7 @@ authors="Geforce132, bl4ckscor3"
 
 [[mods]] #mandatory
 modId="securitycraft" #mandatory
-version="v1.8.18" #mandatory
+version="v1.8.18.1" #mandatory
 displayName="SecurityCraft" #mandatory
 updateJSONURL="https://www.github.com/Geforce132/SecurityCraft/raw/master/Updates/Forge.json"
 description='''