Skip to content

Commit

Permalink
Fixed nullptr error on startup, smithy sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
LewisMcReu committed Oct 2, 2016
1 parent b305d2d commit c6c6917
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'java'
sourceCompatibility=1.8
targetCompatibility=1.8

version = "0.3.5-alpha"
version = "0.5.0-alpha"
group= "com.uberverse.arkcraft" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "arkcraft"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/uberverse/arkcraft/ARKCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public class ARKCraft
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
proxy.preInit(event);
logger = new com.uberverse.lib.Logger(event.getModLog());
proxy.preInit(event);
}

@EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,4 @@ public void run()
}
});
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

public class TileEntitySmithy extends TileEntityEngramCrafter
{
@Override
public void update()
{
super.update();
if (isCrafting() && new Random().nextInt(50) == 0) worldObj.playSound(pos.getX(), pos.getY(), pos.getZ(), "arkcraft:smithyhammer" + (new Random().nextInt(4) + 1), 1, 1, true);
}
@Override
public void update()
{
super.update();
if (isCrafting() && new Random().nextInt(100) == 0) worldObj.playSound(pos.getX(), pos.getY(), pos.getZ(),
"arkcraft:smithy_hammer", 1, 0, true);
}

public TileEntitySmithy()
{
super(24, "smithy");
Expand Down
25 changes: 23 additions & 2 deletions src/main/resources/assets/arkcraft/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
]
},
"forge_burn": {
"category": "neutral",
"category": "block",
"sounds": [
{
"name": "forge_burn",
Expand All @@ -297,12 +297,33 @@
]
},
"campfire_burn": {
"category": "neutral",
"category": "block",
"sounds": [
{
"name": "campfire_burn",
"stream": false
}
]
},
"smithy_hammer": {
"category": "block",
"sounds": [
{
"name": "smithy_hammer1",
"stream": false
},
{
"name": "smithy_hammer2",
"stream": false
},
{
"name": "smithy_hammer3",
"stream": false
},
{
"name": "smithy_hammer4",
"stream": false
}
]
}
}
10 changes: 5 additions & 5 deletions version-check.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"homepage": "https://minecraft.curseforge.com/projects/arkcraft-mod",
"promos": {
"1.8-latest": "0.3.5-alpha",
"1.8-recommended": "0.3.5-alpha"
}
"homepage": "https://minecraft.curseforge.com/projects/arkcraft-mod",
"promos": {
"1.8-latest": "0.5.0-alpha",
"1.8-recommended": "0.5.0-alpha"
}
}

0 comments on commit c6c6917

Please sign in to comment.