Преглед на файлове

shell item, berries and coarse dirt slabs

Kajetan Johannes Hammerle преди 4 години
родител
ревизия
ce6e44622e
променени са 27 файла, в които са добавени 127 реда и са изтрити 15 реда
  1. 5 0
      src/main/java/me/km/blocks/ModBlocks.java
  2. 24 1
      src/main/java/me/km/items/ModItems.java
  3. 1 1
      src/main/resources/META-INF/mods.toml
  4. 7 0
      src/main/resources/assets/km/blockstates/coarse_dirt_slab.json
  5. 9 0
      src/main/resources/assets/km/lang/en_us.json
  6. 0 6
      src/main/resources/assets/km/models/block/honey.json
  7. 0 5
      src/main/resources/assets/km/models/block/poison.json
  8. 8 0
      src/main/resources/assets/km/models/block/slab/bottom_slab_coarse_dirt.json
  9. 8 0
      src/main/resources/assets/km/models/block/slab/upper_slab_coarse_dirt.json
  10. 6 0
      src/main/resources/assets/km/models/item/berry_beast.json
  11. 6 0
      src/main/resources/assets/km/models/item/berry_cloud.json
  12. 6 0
      src/main/resources/assets/km/models/item/berry_experience.json
  13. 6 0
      src/main/resources/assets/km/models/item/berry_gold.json
  14. 6 0
      src/main/resources/assets/km/models/item/berry_magma.json
  15. 6 0
      src/main/resources/assets/km/models/item/berry_work.json
  16. 3 0
      src/main/resources/assets/km/models/item/coarse_dirt_slab.json
  17. 6 0
      src/main/resources/assets/km/models/item/shell.json
  18. BIN
      src/main/resources/assets/km/textures/item/berry/beast_berry.png
  19. BIN
      src/main/resources/assets/km/textures/item/berry/cloud_berry.png
  20. BIN
      src/main/resources/assets/km/textures/item/berry/gold_berry.png
  21. BIN
      src/main/resources/assets/km/textures/item/berry/magma_berry.png
  22. BIN
      src/main/resources/assets/km/textures/item/berry/work_berry.png
  23. BIN
      src/main/resources/assets/km/textures/item/berry/xp_berry.png
  24. BIN
      src/main/resources/assets/km/textures/item/shell.png
  25. 16 0
      src/main/resources/data/km/recipes/coarse_dirt.json
  26. 2 1
      src/main/resources/data/minecraft/tags/blocks/slabs.json
  27. 2 1
      src/main/resources/data/minecraft/tags/items/slabs.json

+ 5 - 0
src/main/java/me/km/blocks/ModBlocks.java

@@ -10,6 +10,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.FireBlock;
 import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.SlabBlock;
 import net.minecraft.item.Item;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemGroup;
@@ -55,6 +56,7 @@ public class ModBlocks {
 
     // slabs
     public static Block gravelSlab;
+    public static Block coarseDirtSlab;
 
     // leaves
     public static Block cherryLeaves;
@@ -158,6 +160,8 @@ public class ModBlocks {
         // slabs
         gravelSlab = register(r, new BlockGravelSlab(Properties.create(Material.SAND, MaterialColor.STONE)
                 .sound(SoundType.GROUND).hardnessAndResistance(0.6f)).setRegistryName("gravel_slab"));
+        coarseDirtSlab = register(r, new SlabBlock(Properties.create(Material.EARTH, MaterialColor.DIRT)
+                .sound(SoundType.GROUND).hardnessAndResistance(0.5f)).setRegistryName("coarse_dirt_slab"));
 
         // leaves
         cherryLeaves = register(r, createLeaves("cherry_leaves"));
@@ -235,6 +239,7 @@ public class ModBlocks {
 
         // slabs
         register(r, gravelSlab, getItemBlock(gravelSlab, ItemGroup.BUILDING_BLOCKS));
+        register(r, coarseDirtSlab, getItemBlock(coarseDirtSlab, ItemGroup.BUILDING_BLOCKS));
 
         // leaves
         register(r, cherryLeaves, getItemBlock(cherryLeaves, ItemGroup.BUILDING_BLOCKS));

+ 24 - 1
src/main/java/me/km/items/ModItems.java

@@ -138,6 +138,7 @@ public class ModItems {
     public static Item scroll;
     public static Item soulStone;
     public static Item piercingStone;
+    public static Item shell;
 
     // food
     public static Item coloredSoup;
@@ -173,6 +174,14 @@ public class ModItems {
     public static Item herbGold;
     public static Item herbBreathing;
     public static Item herbFire;
+    
+    // berry
+    public static Item berryBeast;
+    public static Item berryCloud;
+    public static Item berryGold;
+    public static Item berryMagma;
+    public static Item berryWork;
+    public static Item berryExperience;
 
     private static Item newSword(IItemTier tier) {
         return new SwordItem(tier, 3, -2.4f, (new Item.Properties()).group(ItemGroup.COMBAT));
@@ -224,7 +233,12 @@ public class ModItems {
 
     private static Item newHerb() {
         return new Item(new Properties().group(ItemGroup.FOOD).food(
-                new Food.Builder().setAlwaysEdible().fastToEat().build()));
+                new Food.Builder().hunger(2).saturation(0.1F).setAlwaysEdible().fastToEat().build()));
+    }
+    
+    private static Item newBerry() {
+        return new Item(new Properties().group(ItemGroup.FOOD).food(
+                new Food.Builder().hunger(2).saturation(0.1F).setAlwaysEdible().fastToEat().build()));
     }
 
     private static Item newFood(int food, float saturation) {
@@ -352,6 +366,7 @@ public class ModItems {
         scroll = register(r, newItem(ItemGroup.MISC), "scroll");
         soulStone = register(r, newItem(ItemGroup.MATERIALS), "soul_stone");
         piercingStone = register(r, newItem(ItemGroup.MATERIALS), "piercing_stone");
+        shell = register(r, newItem(ItemGroup.MATERIALS), "shell");
 
         // food
         coloredSoup = register(r, new ItemColoredSoup(), "colored_soup");
@@ -387,6 +402,14 @@ public class ModItems {
         herbGold = register(r, newHerb(), "herb_gold");
         herbBreathing = register(r, newHerb(), "herb_breathing");
         herbFire = register(r, newHerb(), "herb_fire");
+        
+        // berries
+        berryBeast = register(r, newBerry(), "berry_beast");
+        berryCloud = register(r, newBerry(), "berry_cloud");
+        berryGold = register(r, newBerry(), "berry_gold");
+        berryMagma = register(r, newBerry(), "berry_magma");
+        berryWork = register(r, newBerry(), "berry_work");
+        berryExperience = register(r, newBerry(), "berry_experience");
 
         // skill icons
         for(int i = 1; i <= 57; i++) {

+ 1 - 1
src/main/resources/META-INF/mods.toml

@@ -2,7 +2,7 @@ modLoader="javafml"
 loaderVersion="[31,)"
 [[mods]]
 modId="km"
-version="0.0.42"
+version="0.0.43"
 displayName="Kajetans Mod"
 credits="kajetanjohannes"
 authors="kajetanjohannes"

+ 7 - 0
src/main/resources/assets/km/blockstates/coarse_dirt_slab.json

@@ -0,0 +1,7 @@
+{
+    "variants": {
+        "type=bottom": { "model": "km:block/slab/bottom_slab_coarse_dirt" },
+        "type=top": { "model": "km:block/slab/upper_slab_coarse_dirt" },
+        "type=double": { "model": "block/coarse_dirt" }
+    }
+}

+ 9 - 0
src/main/resources/assets/km/lang/en_us.json

@@ -65,6 +65,7 @@
     "block.km.rtall_grass": "Resistant Grass", 
 
     "block.km.gravel_slab": "Gravel Slab", 
+    "block.km.coarse_dirt_slab": "Coarse Dirt Slab",
 
     "block.km.cherry_leaves": "Cherry Leaves", 
     "block.km.apricot_leaves": "Apricot Leaves", 
@@ -157,6 +158,7 @@
     "item.km.scroll": "Scroll", 
     "item.km.soul_stone": "Soul Stone", 
     "item.km.piercing_stone": "Piercing Stone", 
+    "item.km.shell": "Shell", 
 
     "item.km.colored_soup": "Stew", 
     "item.km.fried_egg": "Fried Egg", 
@@ -190,6 +192,13 @@
     "item.km.herb_breathing": "Dianthus Herb", 
     "item.km.herb_fire": "Fire Herb", 
     
+    "item.km.berry_beast": "Beast Berry", 
+    "item.km.berry_cloud": "Cloud Berry", 
+    "item.km.berry_gold": "Gold Berry", 
+    "item.km.berry_magma": "Magma Berry", 
+    "item.km.berry_work": "Work Berry", 
+    "item.km.berry_experience": "Experience Berry", 
+    
     "item.km.skill1": "Skill 1",
     "item.km.skill2": "Skill 2",
     "item.km.skill3": "Skill 3",

+ 0 - 6
src/main/resources/assets/km/models/block/honey.json

@@ -1,6 +0,0 @@
-{
-    "textures": {
-        "particle": "block/water_still"
-    }
-}
-

+ 0 - 5
src/main/resources/assets/km/models/block/poison.json

@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "particle": "block/water_still"
-    }
-}

+ 8 - 0
src/main/resources/assets/km/models/block/slab/bottom_slab_coarse_dirt.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab",
+    "textures": {
+        "bottom": "block/coarse_dirt",
+        "top": "block/coarse_dirt",
+        "side": "block/coarse_dirt"
+    }
+}

+ 8 - 0
src/main/resources/assets/km/models/block/slab/upper_slab_coarse_dirt.json

@@ -0,0 +1,8 @@
+{
+    "parent": "block/slab_top",
+    "textures": {
+        "bottom": "block/coarse_dirt",
+        "top": "block/coarse_dirt",
+        "side": "block/coarse_dirt"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_beast.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/beast_berry"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_cloud.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/cloud_berry"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_experience.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/xp_berry"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_gold.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/gold_berry"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_magma.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/magma_berry"
+    }
+}

+ 6 - 0
src/main/resources/assets/km/models/item/berry_work.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/berry/work_berry"
+    }
+}

+ 3 - 0
src/main/resources/assets/km/models/item/coarse_dirt_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "km:block/slab/bottom_slab_coarse_dirt"
+}

+ 6 - 0
src/main/resources/assets/km/models/item/shell.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "km:item/shell"
+    }
+}

BIN
src/main/resources/assets/km/textures/item/berry/beast_berry.png


BIN
src/main/resources/assets/km/textures/item/berry/cloud_berry.png


BIN
src/main/resources/assets/km/textures/item/berry/gold_berry.png


BIN
src/main/resources/assets/km/textures/item/berry/magma_berry.png


BIN
src/main/resources/assets/km/textures/item/berry/work_berry.png


BIN
src/main/resources/assets/km/textures/item/berry/xp_berry.png


BIN
src/main/resources/assets/km/textures/item/shell.png


+ 16 - 0
src/main/resources/data/km/recipes/coarse_dirt.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "coarse_dirt_slab",
+  "pattern": [
+    "###"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:coarse_dirt"
+    }
+  },
+  "result": {
+    "item": "km:coarse_dirt_slab",
+    "count": 6
+  }
+}

+ 2 - 1
src/main/resources/data/minecraft/tags/blocks/slabs.json

@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "km:gravel_slab"
+    "km:gravel_slab",
+    "km:coarse_dirt_slab"
   ]
 }

+ 2 - 1
src/main/resources/data/minecraft/tags/items/slabs.json

@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "km:gravel_slab"
+    "km:gravel_slab",
+    "km:coarse_dirt_slab"
   ]
 }