Updated Glider to be more akin to BotW

ManasMods · Aug 14, 2023 · c20d6d8 · c20d6d8
1 parent 34d0093
commit c20d6d8
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ minecraftVersionCheck=[1.18.2,1.19)
 modVersion=1.0.2.1
 modId=unordinary_basics
 # Dependencies
-jei_version=10.2.1.1005
+jei_version=9.7.2.281
 manasCoreVersion=1.0.2.0
 apotheosisVersion=4634636
 placeboVersion=4500363

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
diff --git a/...ipes/decorations/slabs_to_block_snow.json → ...ing_blocks/slabs_to_block_snow_block.json b/...ipes/decorations/slabs_to_block_snow.json → ...ing_blocks/slabs_to_block_snow_block.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "minecraft:slabs_to_block_snow"
+      "minecraft:slabs_to_block_snow_block"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "minecraft:slabs_to_block_snow"
+        "recipe": "minecraft:slabs_to_block_snow_block"
       }
     }
   },

diff --git a/...pes/decorations/stairs_to_block_snow.json → ...ng_blocks/stairs_to_block_snow_block.json b/...pes/decorations/stairs_to_block_snow.json → ...ng_blocks/stairs_to_block_snow_block.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "minecraft:stairs_to_block_snow"
+      "minecraft:stairs_to_block_snow_block"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "minecraft:stairs_to_block_snow"
+        "recipe": "minecraft:stairs_to_block_snow_block"
       }
     }
   },

diff --git a/...inecraft/recipes/slabs_to_block_snow.json → ...ft/recipes/slabs_to_block_snow_block.json b/...inecraft/recipes/slabs_to_block_snow.json → ...ft/recipes/slabs_to_block_snow_block.json
@@ -9,6 +9,6 @@
     }
   ],
   "result": {
-    "item": "minecraft:snow"
+    "item": "minecraft:snow_block"
   }
 }
diff --git a/...necraft/recipes/stairs_to_block_snow.json → ...t/recipes/stairs_to_block_snow_block.json b/...necraft/recipes/stairs_to_block_snow.json → ...t/recipes/stairs_to_block_snow_block.json
@@ -15,7 +15,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:snow",
+    "item": "minecraft:snow_block",
     "count": 3
   }
 }
diff --git a/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java b/src/main/java/com/github/manasmods/unordinary_basics/block/ItemSorterBlock.java
@@ -1,7 +1,6 @@
 package com.github.manasmods.unordinary_basics.block;
 
 import com.github.manasmods.unordinary_basics.block.entity.ItemSorterBlockEntity;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -11,7 +10,11 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.BaseEntityBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
@@ -75,7 +78,7 @@ public InteractionResult use(BlockState pState, Level pLevel, BlockPos pPos, Pla
         if (!pLevel.isClientSide()) {
             BlockEntity entity = pLevel.getBlockEntity(pPos);
             if (entity instanceof ItemSorterBlockEntity itemSorterBlockEntity) {
-                if (Screen.hasShiftDown() && pPlayer.getMainHandItem().isEmpty()) {
+                if (pPlayer.isCrouching() && pPlayer.getMainHandItem().isEmpty()) {
                     NetworkHooks.openGui(((ServerPlayer) pPlayer), itemSorterBlockEntity, pPos);
                 } else {
                     itemSorterBlockEntity.filterItemsOfPlayer(pPlayer,pPos,pState,pLevel);

diff --git a/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt b/src/main/java/com/github/manasmods/unordinary_basics/changelog.txt
@@ -1,5 +1,9 @@
 == Change Log ==
 
-¬
+¬ Added Tool Tip to Item Sorter Block
+
+TODO:
+ - Fix Redstone Pouch bug. In jar file (we think), placing down redstone will crash the game.
+ - Update Master Miner to only mine blocks of a same or similar hardness (to avoid cheesing mining long to mine blocks)
 
 == End of Change Log ==
diff --git a/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java b/src/main/java/com/github/manasmods/unordinary_basics/item/custom/GliderItem.java
@@ -17,11 +17,11 @@ public class GliderItem extends Item {
     /**
      * Changes the level of the slow falling effect, the higher this is, the slower the player will fall
      */
-    private static int FALL_SPEED_MODIFIER = 4;
+    private static int FALL_SPEED_MODIFIER = 6;
     /**
      * Changes the glider's automatic movement forward's speed, the higher this is, the slower the glider will move
      */
-    private static int GLIDE_SPEED_MODIFIER = 4;
+    private static int GLIDE_SPEED_MODIFIER = 0;
 
     private static final MobEffectInstance SLOW_FALLING = new MobEffectInstance(MobEffects.SLOW_FALLING, 1, FALL_SPEED_MODIFIER, false, false);
 

diff --git a/src/main/resources/assets/unordinary_basics/lang/en_us.json b/src/main/resources/assets/unordinary_basics/lang/en_us.json
@@ -5,6 +5,7 @@
 
   "block.unordinary_basics.enchantment_library": "Enchantment Library §c(WIP)§",
   "block.unordinary_basics.item_sorter": "Item Sorter",
+  "block.unordinary_basics.item_sorter.desc": "Sneak and Right Click to Open GUI. Right Click to move items from your inventory to block inventory according to what is in the Item Sorters Filters",
 
   "item.minecraft.milk_bucket": "Bucket of Cow's Milk",