Stuff

Author: Ryorama

common/src/main/java/com/ryorama/terrariamod/TerrariaMod.java

@@ -10,17 +10,17 @@
 import dev.architectury.registry.registries.RegistrySupplier;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
-import net.minecraft.item.Item;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Supplier;
 
 public class TerrariaMod {
     public static final String MOD_ID = "terrariamod";
+    public static final Logger LOGGER  = LogManager.getLogger(TerrariaMod.class);
     public static TerrariaModConfig CONFIG = new TerrariaModConfig();
 
     public static final DeferredRegister<Codec<? extends ChunkGenerator>> CHUNK_GENERATORS = DeferredRegister.create(TerrariaMod.MOD_ID, RegistryKeys.CHUNK_GENERATOR);
@@ -32,8 +32,8 @@ public static void init() {
         CONFIG = AutoConfig.getConfigHolder(TerrariaModConfig.class).getConfig();
         CHUNK_GENERATORS.register();
         BuffsT.init();
-        EntitiesT.init();
         BlocksT.init();
+        EntitiesT.init();
         ItemsT.init();
     }
 

common/src/main/java/com/ryorama/terrariamod/items/impl/interfaces/IRareItem.java

@@ -3,15 +3,14 @@
 import net.minecraft.util.Formatting;
 
 public interface IRareItem {
-    public Formatting GREY = Formatting.GRAY;
-    public Formatting WHITE = Formatting.WHITE;
-    public Formatting BLUE = Formatting.BLUE;
-    public Formatting GREEN = Formatting.GREEN;
-    public Formatting ORANGE = Formatting.GOLD;
-    public Formatting LIGHT_RED = Formatting.RED;
-    public Formatting LIGHT_PURPLE = Formatting.LIGHT_PURPLE;
-    public Formatting YELLOW = Formatting.YELLOW;
-    public Formatting RED = Formatting.DARK_RED;
-    public Formatting PURPLE = Formatting.DARK_PURPLE;
-
+    Formatting GREY = Formatting.GRAY;
+    Formatting WHITE = Formatting.WHITE;
+    Formatting BLUE = Formatting.BLUE;
+    Formatting GREEN = Formatting.GREEN;
+    Formatting ORANGE = Formatting.GOLD;
+    Formatting LIGHT_RED = Formatting.RED;
+    Formatting LIGHT_PURPLE = Formatting.LIGHT_PURPLE;
+    Formatting YELLOW = Formatting.YELLOW;
+    Formatting RED = Formatting.DARK_RED;
+    Formatting PURPLE = Formatting.DARK_PURPLE;
 }

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/food/Mushroom.java

@@ -24,6 +24,9 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity,
             playerEntity.heal(15);
             addBuffOnEaten(playerEntity, BuffsT.POTION_SICKNESS,1000);
             handlePlayerHunger(playerEntity, 4, 2);
+            if (!playerEntity.isCreative()) {
+                playerEntity.getStackInHand(hand).decrement(1);
+            }
             return TypedActionResult.success(playerEntity.getStackInHand(hand));
         }
 

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/misc/LifeCrystal.java

@@ -20,11 +20,11 @@ public LifeCrystal(Settings settings) {
     public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity, Hand hand) {
 		if (playerEntity.getAttributeValue(EntityAttributes.GENERIC_MAX_HEALTH) < 400) {
 			playerEntity.playSound(TAudio.HEALTH_CRYSTAL, 1, 1);
-
 			playerEntity.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH).setBaseValue(playerEntity.getAttributeValue(EntityAttributes.GENERIC_MAX_HEALTH) + 20);
 			playerEntity.setHealth((float)(playerEntity.getAttributeValue(EntityAttributes.GENERIC_MAX_HEALTH) + 20));
-	        
-			playerEntity.getInventory().getMainHandStack().decrement(1);
+			if (!playerEntity.isCreative()) {
+				playerEntity.getStackInHand(hand).decrement(1);
+			}
 
 			return TypedActionResult.success(playerEntity.getStackInHand(hand));	
 		}

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/potions/HealingPotion.java

@@ -22,6 +22,9 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity,
             playerEntity.playSound(TAudio.DRINK, 1, 1);
             playerEntity.heal(100);
             BuffsT.AddBuffToEntity(playerEntity, 1000, BuffsT.POTION_SICKNESS);
+            if (!playerEntity.isCreative()) {
+                playerEntity.getStackInHand(hand).decrement(1);
+            }
             return TypedActionResult.success(playerEntity.getStackInHand(hand));
         }
 

common/src/main/java/com/ryorama/terrariamod/items/terraria/consumable/potions/LesserHealingPotion.java

@@ -22,6 +22,9 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity playerEntity,
             playerEntity.playSound(TAudio.DRINK, 1, 1);
             playerEntity.heal(50);
             BuffsT.AddBuffToEntity(playerEntity, 1000, BuffsT.POTION_SICKNESS);
+            if (!playerEntity.isCreative()) {
+                playerEntity.getStackInHand(hand).decrement(1);
+            }
             return TypedActionResult.success(playerEntity.getStackInHand(hand));
         }
 

common/src/main/java/com/ryorama/terrariamod/utils/reflection/ReflectionUtil.java

@@ -0,0 +1,21 @@
+package com.ryorama.terrariamod.world;
+
+import net.minecraft.block.Block;
+
+import java.util.List;
+
+public class OreGen {
+    public final Block oreBlock;
+    public final List<Block> replacableBlocks;
+    public final float genChance;
+    public final int minAmnt;
+    public final int maxAmt;
+
+    public OreGen(Block oreBlock, List<Block> replacableBlocks, float genChance, int minAmnt, int maxAmt) {
+        this.oreBlock = oreBlock;
+        this.replacableBlocks = replacableBlocks;
+        this.genChance = genChance;
+        this.minAmnt = minAmnt;
+        this.maxAmt = maxAmt;
+    }
+}