0.1.16 - Fluid id & ResourceLocation.

Yesterday17 · Jan 13, 2019 · a8179e4 · a8179e4
1 parent 27e94cd
commit a8179e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: "maven"
 
-version = "0.1.15"
+version = "0.1.16"
 group = "cn.yesterday17"
 archivesBaseName = "probe"
 

diff --git a/src/main/java/cn/yesterday17/probe/serializer/FluidSerializer.java b/src/main/java/cn/yesterday17/probe/serializer/FluidSerializer.java
@@ -4,7 +4,9 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 
 import java.lang.reflect.Type;
 
@@ -13,8 +15,10 @@ public class FluidSerializer implements JsonSerializer<Fluid> {
     public JsonElement serialize(Fluid src, Type typeOfSrc, JsonSerializationContext context) {
         JsonObject jsonFluid = new JsonObject();
 
+        jsonFluid.addProperty("id", FluidRegistry.getRegisteredFluidIDs().get(src));
         jsonFluid.addProperty("name", src.getName());
         jsonFluid.addProperty("unlocalizedName", src.getUnlocalizedName());
+        jsonFluid.add("resourceLocation", context.serialize(new ResourceLocation(FluidRegistry.getDefaultFluidName(src))));
         jsonFluid.addProperty("luminosity", src.getLuminosity());
         jsonFluid.addProperty("density", src.getDensity());
         jsonFluid.addProperty("temperature", src.getTemperature());
@@ -25,7 +29,7 @@ public JsonElement serialize(Fluid src, Type typeOfSrc, JsonSerializationContext
         // jsonFluid.add("block", context.serialize(src.getBlock()));
         jsonFluid.add("still", context.serialize(src.getStill()));
         jsonFluid.add("flowing", context.serialize(src.getFlowing()));
-        
+
         return jsonFluid;
     }
 }