2.8 Update

- Massive rewrites on the codebase for less redundancy and easier porting to 1.13 - Added Modes, 3 different Modes so far - Renamed the old 'Mode Switch' to 'Range Switch' as it's more appropriate - Migrated to use isAir check for air blocks - Completely removed String block ID and metadata references and using blockstates instead - Moved Seared Bricks whitelisting to the config instead of hardcoded - Overhauled tooltips for all Exchangers, holding Shift now shows the stats of the Exchangers and holding Ctrl shows available controls for the Exchangers - Tuberous Exchanger now deals more damage than before - Added vanilla wood logs as repair materials for the Wooden Exchangers - Introducing 2 new Exchangers: End Exchanger (Tier 8 vanilla Exchanger, goes after Obsidian) and End Steel Exchanger (Tier 7 Ender IO Exchanger, goes after Vibrant, 1.12+ exclusive) - Fixed a crash with the Dark Steel Exchanger recipe crashing on startup in Easy Mode, closes #55
JackyyTV · Sep 26, 2018 · 03a9336 · 03a9336
1 parent bfc013d
commit 03a9336
Show file tree

Hide file tree

Showing 77 changed files with 718 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Submit any bug reports / suggestions via [issue tracker](https://github.com/Jack
 - Twitter - [@JackyyTV](https://twitter.com/JackyyTV)
 - Discord - Jacky#1234
 - Twitch - [Jackyy](https://www.twitch.tv/jackyy)
-- Reddit - [Jacky1356400](https://www.reddit.com/message/compose/?to=Jacky1356400)
+- Reddit - [JackyyTV](https://www.reddit.com/message/compose/?to=JackyyTV)
 
 ---
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 mc_version=1.12.2
-forge_version=1.12.2-14.23.4.2729
-mod_version=2.7.3
-mappings_version=snapshot_20180704
+forge_version=1.12.2-14.23.4.2760
+mod_version=2.8
+mappings_version=stable_39
diff --git a/src/main/java/jackyy/exchangers/Exchangers.java b/src/main/java/jackyy/exchangers/Exchangers.java
@@ -19,7 +19,7 @@
 @Mod(modid = Exchangers.MODID, version = Exchangers.VERSION, name = Exchangers.MODNAME, dependencies = Exchangers.DEPENDS, certificateFingerprint = "@FINGERPRINT@", acceptedMinecraftVersions = Exchangers.MCVERSION, useMetadata = true)
 public class Exchangers {
 
-    public static final String VERSION = "1.12.2-2.7.3";
+    public static final String VERSION = "1.12.2-2.8";
     public static final String MCVERSION = "[1.12,1.13)";
     public static final String MODID = "exchangers";
     public static final String MODNAME = "Exchangers";
@@ -37,7 +37,7 @@ public class Exchangers {
             + "after:" + IE + ";";
     public static final CreativeTabs TAB = new CreativeTabs(MODID) {
         @Override
-        public ItemStack getTabIconItem() {
+        public ItemStack createIcon() {
             return new ItemStack(ModItems.obsidianExchanger);
         }
     };

diff --git a/src/main/java/jackyy/exchangers/client/CapeBufferDownload.java b/src/main/java/jackyy/exchangers/client/CapeBufferDownload.java
@@ -59,7 +59,7 @@ public ResourceLocation getResourceLocation() {
 
     public ThreadDownloadImageData downloadCape() {
         try {
-            File capeFile = new File(resourceLocation.getResourcePath() + ".png");
+            File capeFile = new File(resourceLocation.getPath() + ".png");
 
             if (capeFile.exists()) {
                 capeFile.delete();

diff --git a/src/main/java/jackyy/exchangers/client/Keys.java b/src/main/java/jackyy/exchangers/client/Keys.java
@@ -11,7 +11,7 @@
 @SideOnly(Side.CLIENT)
 public class Keys {
 
-    public static final KeyBinding MODE_KEY = new KeyBinding("key.exchanger_mode", new IKeyConflictContext() {
+    public static final KeyBinding RANGE_SWITCH_KEY = new KeyBinding("key.exchanger_range_switch", new IKeyConflictContext() {
         @Override
         public boolean isActive() {
             return KeyConflictContext.IN_GAME.isActive();
@@ -22,6 +22,17 @@ public boolean conflicts(IKeyConflictContext other) {
         }
     }, Keyboard.KEY_COMMA, "key.categories.exchangers");
 
+    public static final KeyBinding MODE_SWITCH_KEY = new KeyBinding("key.exchanger_mode_switch", new IKeyConflictContext() {
+        @Override
+        public boolean isActive() {
+            return KeyConflictContext.IN_GAME.isActive();
+        }
+        @Override
+        public boolean conflicts(IKeyConflictContext other) {
+            return other == this || KeyConflictContext.IN_GAME.isActive();
+        }
+    }, Keyboard.KEY_SEMICOLON, "key.categories.exchangers");
+
     public static final KeyBinding FORCE_DROP_ITEMS_KEY = new KeyBinding("key.exchanger_force_drop_items", new IKeyConflictContext() {
         @Override
         public boolean isActive() {
@@ -34,7 +45,8 @@ public boolean conflicts(IKeyConflictContext other) {
     }, Keyboard.KEY_PERIOD, "key.categories.exchangers");
 
     public static void init() {
-        ClientRegistry.registerKeyBinding(MODE_KEY);
+        ClientRegistry.registerKeyBinding(RANGE_SWITCH_KEY);
+        ClientRegistry.registerKeyBinding(MODE_SWITCH_KEY);
         ClientRegistry.registerKeyBinding(FORCE_DROP_ITEMS_KEY);
     }
 

diff --git a/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java b/src/main/java/jackyy/exchangers/handler/ClientEventsHandler.java
@@ -4,12 +4,12 @@
 import jackyy.exchangers.client.CapeBufferDownload;
 import jackyy.exchangers.client.Keys;
 import jackyy.exchangers.handler.network.PacketHandler;
+import jackyy.exchangers.handler.network.PacketSwitchMode;
+import jackyy.exchangers.handler.network.PacketSwitchRange;
 import jackyy.exchangers.handler.network.PacketToggleForceDropItemsMode;
-import jackyy.exchangers.handler.network.PacketToggleMode;
 import jackyy.exchangers.item.ItemExchangerBase;
 import jackyy.exchangers.item.special.ItemCreativeExchanger;
 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.entity.AbstractClientPlayer;
@@ -110,7 +110,7 @@ public void onGameOverlayRender(RenderGameOverlayEvent event) {
             GlStateManager.disableDepth();
             GlStateManager.disableRescaleNormal();
 
-            String exchangeMode = ExchangerHandler.modeSwitchList[stack.getTagCompound().getInteger("mode")];
+            String exchangeMode = ExchangerHandler.modeSwitchList[stack.getTagCompound().getInteger("range")];
             double scale = exchangeMode.length() > 2 ? 1 : 1;
             double swidth = mc.fontRenderer.getStringWidth(exchangeMode) * scale;
             GlStateManager.translate((w / 2 - 2 - swidth), h / 2 - 4, 0);
@@ -132,11 +132,11 @@ public void renderWorldLastEvent(RenderWorldLastEvent event) {
         if (mouseOver != null && mouseOver.sideHit != null) {
             IBlockState state = world.getBlockState(mouseOver.getBlockPos());
             Block block = state.getBlock();
-            if (block.getMaterial(state) != Material.AIR) {
+            if (!block.isAir(state, world, mouseOver.getBlockPos())) {
                 ItemStack stack = player.getHeldItemMainhand();
                 float partialTicks = event.getPartialTicks();
                 if (!stack.isEmpty() && stack.getItem() instanceof ItemExchangerBase && stack.getTagCompound() != null && mouseOver.sideHit != null) {
-                    Set<BlockPos> coordinates = ExchangerHandler.findSuitableBlocks(stack, player.getEntityWorld(), mouseOver.sideHit, mouseOver.getBlockPos(), block, block.getMetaFromState(state));
+                    Set<BlockPos> coordinates = ExchangerHandler.findSuitableBlocks(stack, player.getEntityWorld(), player, mouseOver.sideHit, mouseOver.getBlockPos(), state);
                     double offsetX = player.prevPosX + (player.posX - player.prevPosX) * (double) partialTicks;
                     double offsetY = player.prevPosY + (player.posY - player.prevPosY) * (double) partialTicks;
                     double offsetZ = player.prevPosZ + (player.posZ - player.prevPosZ) * (double) partialTicks;
@@ -152,11 +152,9 @@ public void renderWorldLastEvent(RenderWorldLastEvent event) {
                     GlStateManager.disableDepth();
 
                     for (BlockPos coordinate : coordinates) {
-                        String exId = ExchangerHandler.getTagCompound(stack).getString("block");
                         IBlockState exState = NBTUtil.readBlockState(ExchangerHandler.getTagCompound(stack).getCompoundTag("blockstate"));
-                        Block exBlock = Block.getBlockFromName(exId);
                         float blockHardness = block.getBlockHardness(state, world, coordinate);
-                        if (world.isAirBlock(coordinate) || (exBlock == block && exState == state)) {
+                        if (world.isAirBlock(coordinate) || exState == state) {
                             continue;
                         }
                         double renderX = coordinate.getX() - offsetX;
@@ -167,9 +165,10 @@ public void renderWorldLastEvent(RenderWorldLastEvent event) {
                         float g = 1.0f;
                         float b = 1.0f;
                         float a = 1.0f;
-                        if ((player.isSneaking() &&
-                                ((world.getTileEntity(coordinate) != null && !ExchangerHandler.isWhitelisted(world, coordinate))
-                                        || (!(stack.getItem() instanceof ItemCreativeExchanger) && blockHardness < -0.1f)))) {
+                        if ((player.isSneaking()
+                                && ((world.getTileEntity(coordinate) != null && !ExchangerHandler.isWhitelisted(world, coordinate))
+                                || ExchangerHandler.isBlacklisted(world, coordinate)
+                                || (!(stack.getItem() instanceof ItemCreativeExchanger) && blockHardness < -0.1f)))) {
                             r = 1.0f;
                             g = 0.1f;
                             b = 0.1f;
@@ -216,10 +215,11 @@ public void renderWorldLastEvent(RenderWorldLastEvent event) {
 
     @SubscribeEvent
     public void onKeyInput(InputEvent.KeyInputEvent event) {
-        if (Keys.MODE_KEY.isPressed()) {
-            PacketHandler.INSTANCE.sendToServer(new PacketToggleMode());
-        }
-        if (Keys.FORCE_DROP_ITEMS_KEY.isPressed()) {
+        if (Keys.RANGE_SWITCH_KEY.isPressed()) {
+            PacketHandler.INSTANCE.sendToServer(new PacketSwitchRange());
+        } else if (Keys.MODE_SWITCH_KEY.isPressed()) {
+            PacketHandler.INSTANCE.sendToServer(new PacketSwitchMode());
+        } else if (Keys.FORCE_DROP_ITEMS_KEY.isPressed()) {
             PacketHandler.INSTANCE.sendToServer(new PacketToggleForceDropItemsMode());
         }
     }

diff --git a/src/main/java/jackyy/exchangers/handler/EventsHandler.java b/src/main/java/jackyy/exchangers/handler/EventsHandler.java
@@ -59,8 +59,8 @@ public void onLivingUpdate(LivingEvent.LivingUpdateEvent event) {
     @SubscribeEvent
     public void onMissingMappings(RegistryEvent.MissingMappings<Item> event) {
         for (RegistryEvent.MissingMappings.Mapping<Item> mapping : event.getMappings()) {
-            if (mapping.key.getResourceDomain().equals("exchangers")) {
-                switch (mapping.key.getResourcePath()) {
+            if (mapping.key.getNamespace().equals("exchangers")) {
+                switch (mapping.key.getPath()) {
                     case ("expotato") :
                         mapping.remap(ModItems.tuberousExchanger);
                         break;