Merge remote-tracking branch 'origin/master'

ManasMods · Aug 14, 2023 · f27e541 · f27e541
2 parents 656c147 + 05db76b
commit f27e541
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 78 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
         classpath 'org.parchmentmc:librarian:1.+'
         classpath 'org.spongepowered:mixingradle:0.7.+'
     }
@@ -103,7 +103,7 @@ minecraft {
                 }
             }
 
-            forceExit false
+        //forceExit false
         }
     }
 }
@@ -149,8 +149,8 @@ repositories {
         minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
 
         //Lombok
-        compileOnly 'org.projectlombok:lombok:1.18.26'
-        annotationProcessor 'org.projectlombok:lombok:1.18.26'
+        compileOnly 'org.projectlombok:lombok:1.18.28'
+        annotationProcessor 'org.projectlombok:lombok:1.18.28'
 
         //ManasCore
         implementation fg.deobf("com.github.manasmods:ManasCore:${minecraftVersion}-${manasCoreVersion}")

diff --git a/gradle.properties b/gradle.properties
@@ -5,18 +5,18 @@ minecraftVersion=1.18.2
 # Forge date
 forgeVersion=40.1.76
 # Parchment Version
-parchmentVersion=2022.09.04
+parchmentVersion=2022.11.06
 # mods.toml data
 minecraftVersionCheck=[1.18.2,1.19)
 # Mod Information see https://mcforge.readthedocs.io/en/1.18.x/gettingstarted/versioning/#examples
-modVersion=1.0.2.0
+modVersion=1.0.2.1
 modId=unordinary_basics
 # Dependencies
-jei_version=9.7.0.209
-manasCoreVersion=1.0.0.0
-apotheosisVersion=3846000
-placeboVersion=3845997
+jei_version=9.7.2.281
+manasCoreVersion=1.0.2.0
+apotheosisVersion=4634636
+placeboVersion=4500363
 patchouliVersion=3846086
-enchantmentDescriptionsVersion=3821023
-bookshelfVersion=3832270
-geckolibVersion=3.0.29
+enchantmentDescriptionsVersion=4277221
+bookshelfVersion=4556713
+geckolibVersion=3.0.57
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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,47 +1,10 @@
 == Change Log ==
 
-¬ Added a Custom Inventory
+¬ Added Tool Tip to Item Sorter Block
 
-/** Items **/
-
-¬ Added some new gear
-    - Backpacks
-    - Potion Belt
-    - Quiver
-    - Builder's Glove
-    - Slime Compass
-    - Redstone Pouch
-    - Glider
-    - Rabbit Boots
-¬ Added Map Book (no functionality yet)
-¬ Added new enchantments and curses
-    - Curse of Breaking
-    - Curse of Fatigue
-    - Curse of Hallucination
-    - Master Miner
-    - Vein Miner
-    - Tree Feller
-¬ Added an end-game sword
-¬ Updated Recipes
-¬ Added New Recipes for Stone Tools
-
-/** Blocks **/
-
-¬ Added Item Sorter block
-¬ Added Enchantment Library (no functionality yet)
-¬ Added New Recipes for some blocks crafted with stone
-
-/** Misc Changes **/
-
-¬ Added several new inventory slots
-    - Back Slot
-    - Waist Slot
-¬ Updated some vanilla words
-¬ Ability to hit through foliage
-¬ Added a keybinding to enter prone mode
-¬ Removed the experience limit on the anvil
-¬ Gave special properties to some armour sets
-¬ Made it so dirt-like slabs and stairs behave like their full-block counterparts
-¬ Fixed a bug with bed banner patterns
+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)
+ - Fix Rendering of Glider in Off Hand.
 
 == 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
@@ -5,23 +5,17 @@
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.MoverType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.Vec3;
 
 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;
-    /**
-     * 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 FALL_SPEED_MODIFIER = 8;
 
     private static final MobEffectInstance SLOW_FALLING = new MobEffectInstance(MobEffects.SLOW_FALLING, 1, FALL_SPEED_MODIFIER, false, false);
 
@@ -46,8 +40,6 @@ public void inventoryTick(ItemStack pStack, Level pLevel, Entity pEntity, int pS
         LivingEntity livingEntity = (LivingEntity) pEntity;
 
         livingEntity.addEffect(SLOW_FALLING);
-        Vec3 direction = livingEntity.getViewVector(1.0F);
-        livingEntity.move(MoverType.SELF,new Vec3(direction.x / GLIDE_SPEED_MODIFIER,direction.y / (GLIDE_SPEED_MODIFIER * 2),direction.z / GLIDE_SPEED_MODIFIER));
         System.out.println("Moved");
 
     }

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",