diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java index 00c2bb0647..fa338ddc93 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java @@ -22,6 +22,11 @@ package net.minecraftforge.fluids; import java.util.Map; import java.util.Random; +import javax.annotation.Nonnull; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; + import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; @@ -34,10 +39,10 @@ import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.math.Vec3d; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -48,11 +53,6 @@ import net.minecraftforge.common.property.PropertyFloat; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; - -import javax.annotation.Nonnull; - /** * This is a base implementation for Fluid blocks. * @@ -728,4 +728,22 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock { return NULL_AABB; } + + @Override + @SideOnly (Side.CLIENT) + public Vec3d getFogColor(World world, BlockPos pos, IBlockState state, Entity entity, Vec3d originalColor, float partialTicks) + { + if (getFluid() != null) + { + int color = getFluid().getColor(); + float red = (color >> 16 & 0xFF) / 255.0F; + float green = (color >> 8 & 0xFF) / 255.0F; + float blue = (color & 0xFF) / 255.0F; + return new Vec3d(red, green, blue); + } + else + { + return super.getFogColor(world, pos, state, entity, originalColor, partialTicks); + } + } } diff --git a/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java b/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java index ff283152d6..be2b67c867 100644 --- a/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java +++ b/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java @@ -17,72 +17,111 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; @EventBusSubscriber -@Mod (modid = FogColorInsideMaterialTest.MOD_ID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") +@Mod(modid = FogColorInsideMaterialTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") public class FogColorInsideMaterialTest { + static final boolean ENABLED = false; // <-- enable mod + static int color = 0xFFd742f4; // <-- change value for testing - public static final String MOD_ID = "fogcolorinsidematerialtest"; + public static final String MODID = "fogcolorinsidematerialtest"; - @ObjectHolder ("test_fluid") + static + { + if (ENABLED) + { + FluidRegistry.enableUniversalBucket(); + } + } + + public static final Fluid SLIME = new Fluid("slime", new ResourceLocation(MODID, "slime_still"), new ResourceLocation(MODID, "slime_flow")) { + @Override + public int getColor() + { + return color; + } + }; + + @ObjectHolder("slime") + public static final BlockFluidBase SLIME_BLOCK = null; + @ObjectHolder("test_fluid") public static final Block FLUID_BLOCK = null; - @ObjectHolder ("test_fluid") + @ObjectHolder("test_fluid") public static final Item FLUID_ITEM = null; - private static final ResourceLocation testFluidRegistryName = new ResourceLocation(MOD_ID, "test_fluid"); + private static final ResourceLocation RES_LOC = new ResourceLocation(MODID, "slime"); + private static final ResourceLocation testFluidRegistryName = new ResourceLocation(MODID, "test_fluid"); + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLED) + { + FluidRegistry.registerFluid(SLIME); + FluidRegistry.addBucketForFluid(SLIME); + } + } @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { - Fluid fluid = new Fluid("fog_test", Blocks.WATER.getRegistryName(), Blocks.FLOWING_WATER.getRegistryName()); - FluidRegistry.registerFluid(fluid); - Block fluidBlock = new BlockFluidClassic(fluid, Material.WATER) + if (ENABLED) { - @Override - public Vec3d getFogColor(World world, BlockPos pos, IBlockState state, Entity entity, Vec3d originalColor, float partialTicks) + event.getRegistry().register((new BlockFluidClassic(SLIME, Material.WATER)).setRegistryName(RES_LOC).setUnlocalizedName(RES_LOC.toString())); + Fluid fluid = new Fluid("fog_test", Blocks.WATER.getRegistryName(), Blocks.FLOWING_WATER.getRegistryName()); + FluidRegistry.registerFluid(fluid); + Block fluidBlock = new BlockFluidClassic(fluid, Material.WATER) { - return new Vec3d(0.6F, 0.1F, 0.0F); - } - }; - fluidBlock.setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - fluidBlock.setUnlocalizedName(MOD_ID + ".test_fluid"); - fluidBlock.setRegistryName(testFluidRegistryName); - event.getRegistry().register(fluidBlock); + @Override + public Vec3d getFogColor(World world, BlockPos pos, IBlockState state, Entity entity, Vec3d originalColor, float partialTicks) + { + return new Vec3d(0.6F, 0.1F, 0.0F); + } + }; + event.getRegistry().register(fluidBlock.setCreativeTab(CreativeTabs.BUILDING_BLOCKS).setUnlocalizedName(MODID + ".test_fluid").setRegistryName(testFluidRegistryName)); + } } @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { - event.getRegistry().register(new ItemBlock(FLUID_BLOCK).setRegistryName(testFluidRegistryName)); + if (ENABLED) + { + event.getRegistry().register(new ItemBlock(FLUID_BLOCK).setRegistryName(testFluidRegistryName)); + } } - @EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) + @EventBusSubscriber(value = Side.CLIENT, modid = MODID) public static class ClientEventHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { - ModelResourceLocation fluidLocation = new ModelResourceLocation(testFluidRegistryName, "fluid"); - ModelLoader.registerItemVariants(FLUID_ITEM); - ModelLoader.setCustomMeshDefinition(FLUID_ITEM, stack -> fluidLocation); - ModelLoader.setCustomStateMapper(FLUID_BLOCK, new StateMapperBase() + if (ENABLED) { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) - { - return fluidLocation; - } - }); + ModelResourceLocation fluidLocation = new ModelResourceLocation(testFluidRegistryName, "fluid"); + ModelLoader.registerItemVariants(FLUID_ITEM); + ModelLoader.setCustomMeshDefinition(FLUID_ITEM, stack -> fluidLocation); + ModelLoader.setCustomStateMapper(FLUID_BLOCK, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) + { + return fluidLocation; + } + }); + } } } - } diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/blockstates/slime.json b/src/test/resources/assets/fogcolorinsidematerialtest/blockstates/slime.json new file mode 100644 index 0000000000..edce38c3a5 --- /dev/null +++ b/src/test/resources/assets/fogcolorinsidematerialtest/blockstates/slime.json @@ -0,0 +1,38 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "particle": "blocks/slime", + "all": "examplemod:blocks/slime_flow" + }, + "model": "forge:fluid", + "custom": { "fluid": "slime" }, + "uvlock": false + }, + "variants": { + "normal": [{ + + }], + "inventory": [{ + + }], + "level": { + "0": { }, + "1": { }, + "2": { }, + "3": { }, + "4": { }, + "5": { }, + "6": { }, + "7": { }, + "8": { }, + "9": { }, + "10": { }, + "11": { }, + "12": { }, + "13": { }, + "14": { }, + "15": { } + } + } +} \ No newline at end of file diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/pack.mcmeta b/src/test/resources/assets/fogcolorinsidematerialtest/pack.mcmeta new file mode 100644 index 0000000000..0e24fc3216 --- /dev/null +++ b/src/test/resources/assets/fogcolorinsidematerialtest/pack.mcmeta @@ -0,0 +1,7 @@ +{ + "pack": { + "description": "mod resources", + "pack_format": 3, + "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)." + } +} diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/blockstates/test_fluid.json b/src/test/resources/assets/fogcolorinsidematerialtest/test_fluid.json similarity index 100% rename from src/test/resources/assets/fogcolorinsidematerialtest/blockstates/test_fluid.json rename to src/test/resources/assets/fogcolorinsidematerialtest/test_fluid.json diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png new file mode 100644 index 0000000000..a14140566e Binary files /dev/null and b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png differ diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png.mcmeta b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png.mcmeta new file mode 100644 index 0000000000..058b84f781 --- /dev/null +++ b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_flow.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 20 + } +} + diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_overlay.png b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_overlay.png new file mode 100644 index 0000000000..2c19ed5da4 Binary files /dev/null and b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_overlay.png differ diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png new file mode 100644 index 0000000000..9538697b9a Binary files /dev/null and b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png differ diff --git a/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png.mcmeta b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png.mcmeta new file mode 100644 index 0000000000..090b11d7af --- /dev/null +++ b/src/test/resources/assets/fogcolorinsidematerialtest/textures/slime_still.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 20 + } +}