-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added passive heater, fluids and a bit of cleanup
- Loading branch information
Showing
22 changed files
with
836 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/main/java/com/headfishindustries/sticky/blocks/BlockPassiveHeater.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package com.headfishindustries.sticky.blocks; | ||
|
|
||
| import com.headfishindustries.sticky.blocks.fluid.StickyFluids; | ||
|
|
||
| import net.minecraft.block.BlockCauldron; | ||
| import net.minecraft.block.state.IBlockState; | ||
| import net.minecraft.entity.player.EntityPlayer; | ||
| import net.minecraft.init.Items; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.util.EnumFacing; | ||
| import net.minecraft.util.EnumHand; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.World; | ||
| import net.minecraftforge.common.ForgeModContainer; | ||
| import net.minecraftforge.fluids.FluidRegistry; | ||
| import net.minecraftforge.fluids.UniversalBucket; | ||
|
|
||
| public class BlockPassiveHeater extends BlockCauldron{ | ||
|
|
||
|
|
||
| @Override | ||
| public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) | ||
| { | ||
| ItemStack itemstack = playerIn.getHeldItem(hand); | ||
|
|
||
| if (itemstack.getItem() == Items.BUCKET && state.getValue(LEVEL) == 3){ | ||
| float temp = checkBiome(worldIn, pos); | ||
| if (temp <= 0.2) playerIn.setHeldItem(hand, UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, StickyFluids.coldWater)); | ||
| else if (temp >= 1) playerIn.setHeldItem(hand, UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, StickyFluids.hotWater)); | ||
| else if (temp >= 0.6) playerIn.setHeldItem(hand, UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, StickyFluids.lukewarmWater)); | ||
| else playerIn.setHeldItem(hand, UniversalBucket.getFilledBucket(ForgeModContainer.getInstance().universalBucket, FluidRegistry.WATER)); | ||
| this.setWaterLevel(worldIn, pos, state, 0); | ||
| return true; | ||
| } | ||
| else return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ); | ||
| } | ||
|
|
||
| public float checkBiome(World worldIn, BlockPos pos){ | ||
| return worldIn.getBiome(pos).getFloatTemperature(pos); | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/main/java/com/headfishindustries/sticky/blocks/fluid/BlockStickyFluid.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| import com.headfishindustries.sticky.defs.TabDefs; | ||
|
|
||
| import net.minecraft.block.material.Material; | ||
| import net.minecraftforge.fluids.BlockFluidClassic; | ||
| import net.minecraftforge.fluids.Fluid; | ||
| import net.minecraftforge.fluids.FluidRegistry; | ||
|
|
||
| public class BlockStickyFluid extends BlockFluidClassic{ | ||
| public BlockStickyFluid(Fluid fluid, Material material){ | ||
| super(fluid, material); | ||
| setCreativeTab(TabDefs.tabStickyTrees); | ||
| } | ||
|
|
||
| @Nonnull | ||
| @Override | ||
| public String getUnlocalizedName() { | ||
| Fluid f = FluidRegistry.getFluid(fluidName); | ||
| if(f != null) return f.getUnlocalizedName(); | ||
| return super.getUnlocalizedName(); | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/headfishindustries/sticky/blocks/fluid/FluidColdWater.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraftforge.fluids.Fluid; | ||
|
|
||
| public class FluidColdWater extends Fluid{ | ||
| public static final String name = "cold_water"; | ||
| public static final FluidColdWater instance = new FluidColdWater(); | ||
|
|
||
| public FluidColdWater() | ||
| { | ||
| super(name, new ResourceLocation("blocks/water_still"), new ResourceLocation("blocks/water_flowing")); | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/headfishindustries/sticky/blocks/fluid/FluidHotWater.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraftforge.fluids.Fluid; | ||
|
|
||
| public class FluidHotWater extends Fluid{ | ||
| public static final String name = "hot_water"; | ||
| public static final FluidHotWater instance = new FluidHotWater(); | ||
|
|
||
| public FluidHotWater() | ||
| { | ||
| super(name, new ResourceLocation("blocks/water_still"), new ResourceLocation("blocks/water_flowing")); | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/headfishindustries/sticky/blocks/fluid/FluidLukewarmWater.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraftforge.fluids.Fluid; | ||
|
|
||
| public class FluidLukewarmWater extends Fluid{ | ||
| public static final String name = "lukewarm_water"; | ||
| public static final FluidLukewarmWater instance = new FluidLukewarmWater(); | ||
|
|
||
| public FluidLukewarmWater() | ||
| { | ||
| super(name, new ResourceLocation("blocks/water_still"), new ResourceLocation("blocks/water_flowing")); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/java/com/headfishindustries/sticky/blocks/fluid/FluidSap.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import com.headfishindustries.sticky.Sticky; | ||
|
|
||
| import net.minecraft.util.ResourceLocation; | ||
| import net.minecraftforge.fluids.Fluid; | ||
|
|
||
| public class FluidSap extends Fluid{ | ||
| public static final String name = "sap"; | ||
| public static final FluidSap instance = new FluidSap(); | ||
|
|
||
| public FluidSap() | ||
| { | ||
| super(name, new ResourceLocation(Sticky.MODID + ":blocks/" + name + "_still"), new ResourceLocation(Sticky.MODID + ":blocks/" + name + "_flowing")); | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
src/main/java/com/headfishindustries/sticky/blocks/fluid/StickyFluids.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package com.headfishindustries.sticky.blocks.fluid; | ||
|
|
||
| import net.minecraftforge.fluids.Fluid; | ||
| import net.minecraftforge.fluids.FluidRegistry; | ||
|
|
||
| public class StickyFluids { | ||
| public static Fluid coldWater; | ||
| public static Fluid lukewarmWater; | ||
| public static Fluid hotWater; | ||
| public static Fluid sap; | ||
|
|
||
| static{setupFluids();} | ||
| public static void setupFluids(){ | ||
| coldWater = FluidColdWater.instance; | ||
| coldWater.setTemperature(5); | ||
| FluidRegistry.addBucketForFluid(coldWater); | ||
|
|
||
| lukewarmWater = FluidLukewarmWater.instance; | ||
| lukewarmWater.setTemperature(32); | ||
| FluidRegistry.addBucketForFluid(lukewarmWater); | ||
|
|
||
| hotWater = FluidHotWater.instance; | ||
| hotWater.setTemperature(95); | ||
| FluidRegistry.addBucketForFluid(hotWater); | ||
|
|
||
| sap = FluidSap.instance; | ||
| sap.setTemperature(32); | ||
| FluidRegistry.addBucketForFluid(sap); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/main/resources/assets/sticky/blockstates/passive_heater.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "forge_marker": 1, | ||
| "defaults": { | ||
| "transform": "forge:default-block" | ||
| }, | ||
| "variants": { | ||
| "level=0": { "model": "sticky:passive_heater_empty" }, | ||
| "level=1": { "model": "sticky:passive_heater_level1" }, | ||
| "level=2": { "model": "sticky:passive_heater_level2" }, | ||
| "level=3": { "model": "sticky:passive_heater_level3" }, | ||
| "normal": { "model": "sticky:passive_heater_empty" } | ||
| } | ||
| } |
Oops, something went wrong.