updated gitignore

1.11/.gitignore

@@ -16,6 +16,8 @@ usercache.json
 usernamecache.json
 options.txt
 screenshots/
+world/
+mods/
 
 # eclipse
 bin

1.11/build.gradle

@@ -28,7 +28,7 @@ repositories {
 
     maven {
         name = "primal"
-        url "http://maven.nmd.so"
+        url "https://maven.nmd.so"
     }
 }
 

1.11/config/forge.cfg

@@ -8,7 +8,7 @@ client {
     B:zoomInMissingModelTextInGui=false
 
     # The timestamp of the last reminder to update to Java 8 in number of milliseconds since January 1, 1970, 00:00:00 GMT. Nag will show only once every 24 hours. To disable it set this to some really high number.
-    D:java8Reminder=0.0
+    D:java8Reminder=0
 
     # Disable culling of hidden faces next to stairs and slabs. Causes extra rendering, but may fix some resource packs that exploit this vanilla mechanic.
     B:disableStairSlabCulling=false
@@ -66,6 +66,12 @@ general {
 
     # Enable the forge block rendering pipeline - fixes the lighting of custom models.
     B:forgeLightPipelineEnabled=true
+
+    # Log cascading chunk generation issues during terrain population.
+    B:logCascadingWorldGeneration=true
+
+    # The time in ticks the server will wait when a dimension was queued to unload. This can be useful when rapidly loading and unloading dimensions, like e.g. throwing items through a nether portal a few time per second.
+    I:dimensionUnloadQueueDelay=0
     B:enableGlobalConfig=false
 }
 

1.11/gradle.properties

@@ -6,11 +6,11 @@ org.gradle.jvmargs=-Xmx3G
 mod_group=nmd.primal.forgecraft
 mod_name=ForgeCraft
 mod_version=1.2.22
-forge_version=13.20.0.2226
+forge_version=13.20.0.2311
-mcp_mappings=snapshot_20161220
+mcp_mappings=snapshot_20170121
 mc_version=1.11.2
 
 primal_version=0.4+
-jei_version=4.2+
+jei_version=4.3+
 waila_version=1.7.0-B3
 apple_version=2.1+

1.11/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Sun Jun 04 19:50:32 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

1.11/server.properties

@@ -1,14 +1,14 @@
 #Minecraft server properties
-#Tue Apr 04 17:37:36 EDT 2017
+#Fri Jun 02 00:08:14 EDT 2017
 max-tick-time=60000
 generator-settings=
-allow-nether=true
 force-gamemode=false
-gamemode=0
+allow-nether=true
+gamemode=1
 enable-query=false
 player-idle-timeout=0
 difficulty=1
-spawn-monsters=true
+spawn-monsters=false
 op-permission-level=4
 announce-player-achievements=true
 pvp=true
@@ -23,16 +23,16 @@ max-world-size=29999984
 server-port=25565
 server-ip=
 spawn-npcs=true
-allow-flight=false
+allow-flight=true
 level-name=world
 view-distance=10
 resource-pack=
 spawn-animals=true
 white-list=false
 generate-structures=true
-online-mode=true
+online-mode=false
 max-build-height=256
 level-seed=
 prevent-proxy-connections=false
-motd=A Minecraft Server
 enable-rcon=false
+motd=A Minecraft Server

1.11/src/main/java/nmd/primal/forgecraft/blocks/IngotBall.java

@@ -92,7 +92,7 @@ public class IngotBall extends BlockCustomBase {
     {
         this.updateTick(world, pos, state, random);
         if(!world.isRemote){
-            if ( ThreadLocalRandom.current().nextInt(0,1) == 0) {
+            if ( ThreadLocalRandom.current().nextInt(0,4) == 0) {
                 if(state.getValue(ACTIVE) == true) {
                     world.setBlockState(pos, state.withProperty(ACTIVE, Boolean.valueOf(false)), 2);
                     world.playSound((EntityPlayer) null, pos, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F);

1.11/src/main/java/nmd/primal/forgecraft/compat/JEI.java

@@ -0,0 +1,15 @@
+package nmd.primal.forgecraft.compat;
+
+import mezz.jei.api.BlankModPlugin;
+import mezz.jei.api.IModRegistry;
+
+/**
+ * Created by mminaie on 6/1/17.
+ */
+public class JEI extends BlankModPlugin
+{
+    @Override
+    public void register(IModRegistry registry) {
+
+    }
+}

1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java

@@ -20,6 +20,7 @@ import nmd.primal.forgecraft.items.tools.CustomAxe;
 import nmd.primal.forgecraft.items.tools.CustomHoe;
 import nmd.primal.forgecraft.items.tools.CustomPickaxe;
 import nmd.primal.forgecraft.items.tools.CustomShovel;
+import nmd.primal.forgecraft.items.weapons.CustomShield;
 import nmd.primal.forgecraft.items.weapons.CustomSword;
 
 /**
@@ -91,6 +92,11 @@ public class ModItems {
     public static Item steelsword;
     public static Item wootzsword;
 
+    public static Item wroughtironshield;
+    //public static Item cleanironshield;
+    //public static Item steelshield;
+    //public static Item wootzshield;
+
     public static Item matchlockmusket;
 
     //public static Item forgingmanual;
@@ -156,6 +162,8 @@ public class ModItems {
         steelsword = new CustomSword("ironsword", PrimalMaterials.TOOL_BASIC_STEEL);
         wootzsword = new CustomSword("ironsword", PrimalMaterials.TOOL_WOOTZ_STEEL);
 
+        wroughtironshield = new CustomShield("wroughtironshield", PrimalMaterials.TOOL_WROUGHT_IRON);
+
         /**********
          INGOTS AND CHUNKS
          **********/
@@ -237,6 +245,7 @@ public class ModItems {
          WEAPONS
          **********/
         GameRegistry.register(ironsword);
+        GameRegistry.register(wroughtironshield);
         //GameRegistry.register(matchlockmusket);
 
         //GameRegistry.register(forgingmanual);
@@ -305,6 +314,7 @@ public class ModItems {
          WEAPONS
          **********/
         registerRender(ironsword);
+        registerRender(wroughtironshield);
         //registerRender(forgingmanual);
         //registerRender(matchlockmusket);
     }

1.11/src/main/java/nmd/primal/forgecraft/items/parts/ToolPart.java

@@ -208,7 +208,7 @@ public class ToolPart extends Item implements ToolNBT{
                     }
 
                     if (getHot(item) == false) {
-                        if (item.getSubCompound("tags").getInteger("modifiers") == 0) {
+                        if (getModifiers(item) == 0) {
                             return 0.0F;
                         }
                     }

1.11/src/main/java/nmd/primal/forgecraft/items/weapons/CustomShield.java

@@ -10,6 +10,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import nmd.primal.forgecraft.ModInfo;
 
 import javax.annotation.Nullable;
 
@@ -18,13 +19,16 @@ import javax.annotation.Nullable;
  */
 public class CustomShield extends ItemShield {
 
-    public CustomShield(Item.ToolMaterial material)
+    public CustomShield(String name, Item.ToolMaterial material)
     {
-        this.maxStackSize = 1;
+        this.setUnlocalizedName(name);
-        this.setCreativeTab(CreativeTabs.COMBAT);
+        this.setRegistryName(name);
+        this.setCreativeTab(ModInfo.TAB_FORGECRAFT);
+        this.setMaxStackSize(1);
+        this.setNoRepair();
         this.setMaxDamage(material.getMaxUses());
-        this.addPropertyOverride(new ResourceLocation("blocking"), new IItemPropertyGetter()
+
-        {
+        this.addPropertyOverride(new ResourceLocation("blocking"), new IItemPropertyGetter() {
             @SideOnly(Side.CLIENT)
             public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn)
             {

1.11/src/main/resources/assets/forgecraft/models/item/shield_tall_wroughtiron.json

@@ -0,0 +1,166 @@
+{
+	"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
+	"parent": "builtin/entity",
+	"textures": {
+		"particle": "forgecraft:items/iron_ingot",
+		"texture": "forgecraft:items/iron_ingot",
+		"texture1": "forgecraft:blocks/leather"
+	},
+	"elements": [
+		{
+			"__comment": "Cube1",
+			"from": [ 4, -2, 5 ],
+			"to": [ 12.5, 18, 6 ],
+			"faces": {
+				"down": { "uv": [ 4, 10, 12.5, 11 ], "texture": "#texture" },
+				"up": { "uv": [ 4, 5, 12.5, 6 ], "texture": "#texture" },
+				"north": { "uv": [ 3.5, 0, 12, 16 ], "texture": "#texture" },
+				"south": { "uv": [ 4, 0, 12.5, 16 ], "texture": "#texture" },
+				"west": { "uv": [ 5, 0, 6, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 10, 0, 11, 16 ], "texture": "#texture" }
+			}
+		},
+		{
+			"__comment": "Cube3",
+			"from": [ 11.9268, -2, 5.1768 ],
+			"to": [ 12.4268, 18, 8.6768 ],
+			"rotation": { "origin": [ 12, -2, 5 ], "axis": "y", "angle": 22.5 },
+			"faces": {
+				"down": { "uv": [ 11.5, 10, 15, 11 ], "texture": "#texture", "rotation": 270 },
+				"up": { "uv": [ 11.5, 5, 15, 6 ], "texture": "#texture", "rotation": 90 },
+				"north": { "uv": [ 5, 0, 5.5, 16 ], "texture": "#texture", "rotation": 180 },
+				"south": { "uv": [ 7, 0, 7.5, 16 ], "texture": "#texture", "rotation": 180 },
+				"west": { "uv": [ 6, 0, 9.5, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 5, 16, 8.5, 0 ], "texture": "#texture" }
+			}
+		},
+		{
+			"__comment": "Cube3",
+			"from": [ 4, -2, 5 ],
+			"to": [ 4.5, 18, 8.5 ],
+			"rotation": { "origin": [ 4, 18, 5 ], "axis": "y", "angle": -22.5 },
+			"faces": {
+				"down": { "uv": [ 11.5, 10, 15, 11 ], "texture": "#texture", "rotation": 270 },
+				"up": { "uv": [ 11.5, 5, 15, 6 ], "texture": "#texture", "rotation": 90 },
+				"north": { "uv": [ 5, 0, 5.5, 16 ], "texture": "#texture", "rotation": 180 },
+				"south": { "uv": [ 7, 0, 7.5, 16 ], "texture": "#texture", "rotation": 180 },
+				"west": { "uv": [ 6, 0, 9.5, 16 ], "texture": "#texture" },
+				"east": { "uv": [ 5, 16, 8.5, 0 ], "texture": "#texture" }
+			}
+		},
+		{
+			"__comment": "Cube5",
+			"from": [ 5.5, 6, 6 ],
+			"to": [ 6.5, 6.5, 7 ],
+			"faces": {
+				"down": { "uv": [ 7, 10, 6, 9 ], "texture": "#texture1", "rotation": 90 },
+				"up": { "uv": [ 9, 9, 10, 10 ], "texture": "#texture1", "rotation": 270 },
+				"north": { "uv": [ 10, 9, 10.5, 10 ], "texture": "#texture1", "rotation": 90 },
+				"south": { "uv": [ 5.5, 9, 6, 10 ], "texture": "#texture1", "rotation": 270 },
+				"west": { "uv": [ 5.5, 6, 6, 7 ], "texture": "#texture1", "rotation": 270 },
+				"east": { "uv": [ 6, 10, 5.5, 9 ], "texture": "#texture1", "rotation": 90 }
+			}
+		},
+		{
+			"__comment": "Cube5",
+			"from": [ 5.5, 9.5, 6 ],
+			"to": [ 6.5, 10, 7 ],
+			"faces": {
+				"down": { "uv": [ 7, 10, 6, 9 ], "texture": "#texture1", "rotation": 90 },
+				"up": { "uv": [ 9, 9, 10, 10 ], "texture": "#texture1", "rotation": 270 },
+				"north": { "uv": [ 10, 9, 10.5, 10 ], "texture": "#texture1", "rotation": 90 },
+				"south": { "uv": [ 5.5, 9, 6, 10 ], "texture": "#texture1", "rotation": 270 },
+				"west": { "uv": [ 5.5, 6, 6, 7 ], "texture": "#texture1", "rotation": 270 },
+				"east": { "uv": [ 6, 10, 5.5, 9 ], "texture": "#texture1", "rotation": 90 }
+			}
+		},
+		{
+			"__comment": "Cube7",
+			"from": [ 5.5, 6, 7 ],
+			"to": [ 6.5, 10, 7.5 ],
+			"faces": {
+				"down": { "uv": [ 5.5, 8.5, 6.5, 9 ], "texture": "#texture1" },
+				"up": { "uv": [ 5.5, 7, 6.5, 7.5 ], "texture": "#texture1" },
+				"north": { "uv": [ 9.5, 6, 10.5, 10 ], "texture": "#texture1" },
+				"south": { "uv": [ 5.5, 6, 6.5, 10 ], "texture": "#texture1" },
+				"west": { "uv": [ 7, 6, 7.5, 10 ], "texture": "#texture1" },
+				"east": { "uv": [ 8.5, 6, 9, 10 ], "texture": "#texture1" }
+			}
+		},
+		{
+			"__comment": "Cube5",
+			"from": [ 9.5, 6, 6 ],
+			"to": [ 10.5, 6.5, 7 ],
+			"faces": {
+				"down": { "uv": [ 7, 10, 6, 9 ], "texture": "#texture1", "rotation": 90 },
+				"up": { "uv": [ 9, 9, 10, 10 ], "texture": "#texture1", "rotation": 270 },
+				"north": { "uv": [ 10, 9, 10.5, 10 ], "texture": "#texture1", "rotation": 90 },
+				"south": { "uv": [ 5.5, 9, 6, 10 ], "texture": "#texture1", "rotation": 270 },
+				"west": { "uv": [ 5.5, 6, 6, 7 ], "texture": "#texture1", "rotation": 270 },
+				"east": { "uv": [ 6, 10, 5.5, 9 ], "texture": "#texture1", "rotation": 90 }
+			}
+		},
+		{
+			"__comment": "Cube5",
+			"from": [ 9.5, 9.5, 6 ],
+			"to": [ 10.5, 10, 7 ],
+			"faces": {
+				"down": { "uv": [ 7, 10, 6, 9 ], "texture": "#texture1", "rotation": 90 },
+				"up": { "uv": [ 9, 9, 10, 10 ], "texture": "#texture1", "rotation": 270 },
+				"north": { "uv": [ 10, 9, 10.5, 10 ], "texture": "#texture1", "rotation": 90 },
+				"south": { "uv": [ 5.5, 9, 6, 10 ], "texture": "#texture1", "rotation": 270 },
+				"west": { "uv": [ 5.5, 6, 6, 7 ], "texture": "#texture1", "rotation": 270 },
+				"east": { "uv": [ 6, 10, 5.5, 9 ], "texture": "#texture1", "rotation": 90 }
+			}
+		},
+		{
+			"__comment": "Cube7",
+			"from": [ 9.5, 6, 7 ],
+			"to": [ 10.5, 10, 7.5 ],
+			"faces": {
+				"down": { "uv": [ 5.5, 8.5, 6.5, 9 ], "texture": "#texture1" },
+				"up": { "uv": [ 5.5, 7, 6.5, 7.5 ], "texture": "#texture1" },
+				"north": { "uv": [ 9.5, 6, 10.5, 10 ], "texture": "#texture1" },
+				"south": { "uv": [ 5.5, 6, 6.5, 10 ], "texture": "#texture1" },
+				"west": { "uv": [ 7, 6, 7.5, 10 ], "texture": "#texture1" },
+				"east": { "uv": [ 8.5, 6, 9, 10 ], "texture": "#texture1" }
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation":  [ 0, -2, 2 ]
+		},
+		"thirdperson_lefthand": {
+			"translation":  [ 0, -2, 2 ]
+		},
+		"firstperson_righthand": {
+			"rotation":  [ 0, -22.5, 0 ],
+			"translation":  [ 0, -4, 6 ]
+		},
+		"firstperson_lefthand": {
+			"rotation":  [ 0, -22.5, 0 ],
+			"translation":  [ 0, -4, 6 ]
+		},
+		"gui": {
+			"scale":  [ 0.7, 0.7, 0.7 ]
+		},
+		"ground": {
+			"rotation":  [ -90, 0, 0 ],
+			"scale":  [ 0.5, 0.5, 0.5 ]
+		},
+		"fixed": {
+			"rotation":  [ 0, 180, 0 ],
+			"translation":  [ 0, 0, -1.5 ],
+			"scale":  [ 0.9, 0.9, 0.9 ]
+		}
+	},
+	"overrides": [
+		{
+			"predicate": {
+				"blocking": 1
+			},
+			"model": "item/shield_blocking"
+		}
+	]
+}

1.11/src/main/resources/assets/forgecraft/models/item/vanilla_shield.json

@@ -0,0 +1,48 @@
+{
+    "parent": "builtin/entity",
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, 90, 0 ],
+            "translation": [ 10.51, 6, -4 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 0 ],
+            "translation": [ 10.51, 6, 12 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 180, 5 ],
+            "translation": [ -10, 2, -10 ],
+            "scale": [ 1.25, 1.25, 1.25 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 180, 5 ],
+            "translation": [ 10, 0, -10 ],
+            "scale": [ 1.25, 1.25, 1.25 ]
+        },
+        "gui": {
+            "rotation": [ 15, -25, -5 ],
+            "translation": [ 2, 3, 0 ],
+            "scale": [ 0.65, 0.65, 0.65 ]
+        },
+        "fixed": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ -2, 4, -5],
+            "scale":[ 0.5, 0.5, 0.5]
+        },
+        "ground": {
+            "rotation": [ 0, 0, 0 ],
+            "translation": [ 4, 4, 2],
+            "scale":[ 0.25, 0.25, 0.25]
+        }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "item/shield_blocking"
+        }
+    ]
+}