Version difference

jaquadro · Feb 23, 2020 · 7a0f104 · 7a0f104
1 parent 0352680
commit 7a0f104
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_base_version=1.15
 minecraft_version=1.15.2
 forge_version=1.15.2-31.1.14
 forge_mappings=20200215-1.15.1
-mod_version=7.0.1
+mod_version=7.0.2
 
 jei_version=6.0.0.11
 hwyla_version=1.10.5-B66_1.14.4

diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java
@@ -290,14 +290,14 @@ public ActionResultType onBlockActivated (BlockState state, World world, BlockPo
                     if (!world.isRemote)
                         player.sendStatusMessage(new TranslationTextComponent("message.storagedrawers.cannot_add_upgrade"), true);
 
-                    return false;
+                    return ActionResultType.PASS;
                 }
 
                 if (!tileDrawers.upgrades().addUpgrade(item)) {
                     if (!world.isRemote)
                         player.sendStatusMessage(new TranslationTextComponent("message.storagedrawers.max_upgrades"), true);
 
-                    return false;
+                    return ActionResultType.PASS;
                 }
 
                 world.notifyBlockUpdate(pos, state, state, 3);
@@ -308,7 +308,7 @@ public ActionResultType onBlockActivated (BlockState state, World world, BlockPo
                         player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY);
                 }
 
-                return true;
+                return ActionResultType.SUCCESS;
             }
             /*else if (item.getItem() instanceof ItemPersonalKey) {
                 String securityKey = ((ItemPersonalKey) item.getItem()).getSecurityProviderKey(item.getItemDamage());

diff --git a/...java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java b/...java/com/jaquadro/minecraft/storagedrawers/client/renderer/TileEntityDrawersRenderer.java
@@ -51,7 +51,10 @@ public void render (TileEntityDrawers tile, float partialTickTime, MatrixStack m
         if (!(state.getBlock() instanceof BlockDrawers))
             return;
 
-        //combinedLight = 15728880;
+        if (tile.upgrades().hasIlluminationUpgrade()) {
+            int blockLight = Math.max(combinedLight % 65536, 208);
+            combinedLight = (combinedLight & 0xFFFF0000) | blockLight;
+        }
 
         renderItem = Minecraft.getInstance().getItemRenderer();
         Direction side = state.get(BlockDrawers.HORIZONTAL_FACING);