Skip to content

Commit d46d2e8

Browse files
committed
Fix fluids not being diferentiated by type
1 parent 41c4d93 commit d46d2e8

File tree

5 files changed

+2
-19
lines changed

5 files changed

+2
-19
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
apply plugin: 'net.minecraftforge.gradle.forge'
1111
apply plugin: 'java'
1212

13-
version = "0.5-beta"
13+
version = "0.5.1-beta"
1414
group = "glowredman.modularmaterials"
1515
archivesBaseName = "modularmaterials"
1616

src/main/java/glowredman/modularmaterials/Main.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,9 @@ public static void init(FMLInitializationEvent event) {
4141
proxy.init(event);
4242
}
4343

44-
@EventHandler
45-
public static void postInit(FMLPostInitializationEvent event) {
46-
proxy.postinit(event);
47-
}
48-
4944
@EventHandler
5045
public static void serverStarting(FMLServerStartingEvent event) {
5146
proxy.serverStarting(event);
5247
}
5348

54-
@EventHandler
55-
public static void serverStarted(FMLServerStartedEvent event) {
56-
proxy.serverStarted(event);
57-
}
58-
5949
}

src/main/java/glowredman/modularmaterials/proxy/ClientProxy.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ public void init(FMLInitializationEvent event) {
6767
WorldGenerator.register();
6868
}
6969

70-
@Override
71-
public void serverStarted(FMLServerStartedEvent event) {
72-
}
73-
7470
@Override
7571
public void registerItemRenderer(Item item, String name, int meta) {
7672
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(MODID + ':' + name, "inventory"));

src/main/java/glowredman/modularmaterials/proxy/CommonProxy.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,9 @@ public void init(FMLInitializationEvent event) {
5454
WorldGenerator.register();
5555
}
5656

57-
public void postinit(FMLPostInitializationEvent event) {}
58-
5957
public void serverStarting(FMLServerStartingEvent event) {
6058
event.registerServerCommand(new Command());
6159
}
62-
63-
public void serverStarted(FMLServerStartedEvent event) {}
6460

6561
public void registerItemRenderer(Item item, String name, int meta) {}
6662

src/main/java/glowredman/modularmaterials/util/FluidHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static void registerFluids() {
4242
String texture = "fluids/" + material.texture + '/' + type;
4343
String name = materialEntry.getKey().toLowerCase().replace(' ', '_');
4444
String unlocalizedName = name;
45+
name = type + "." + name;
4546
int temperature = material.temperature;
4647
int color = material.color.getARGB();
4748
int density = 1000;

0 commit comments

Comments
 (0)