Skip to content

Commit 1733cd0

Browse files
committed
Pre-Release cleanup Part VII
- Changed Mill textures - Changed Press textures - Changed Cooking Pot textures - Changed Clay Oven textures - Added fall damage reduction to Reeds Bale - Added particles to Stove - Refactored Evaporator, deprecated Evaporator renderer - Changed Evaporator GUI, added config option for time until explosion - Made Machine item registry OreDict-sensitive - Cleaned up TileEntities, GUIs, Slots, Containers and World Generation - Hooked deprecated recipes up to a config
1 parent 8db94d0 commit 1733cd0

File tree

137 files changed

+2051
-1483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2051
-1483
lines changed

src/main/java/darkbum/saltymod/SaltyMod.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ public void postInit(FMLPostInitializationEvent event) {
185185
}
186186

187187
// Load deprecated (legacy) recipes
188-
DeprecatedRecipes.init();
188+
if (!enableMachines || enableDeprecatedRecipes) {
189+
DeprecatedRecipes.init();
190+
}
189191

190192
proxy.postInit(event);
191193

@@ -202,7 +204,6 @@ public void postInit(FMLPostInitializationEvent event) {
202204
* - Underground Salt Lakes? [MAYBE]
203205
* - Underground Salt Caves/Tunnels/Mines? [MAYBE]
204206
* - Recipe Book [LATER]
205-
* - Fix up the latest Config changes
206207
* - Add Press/Cooking Pot/Clay Oven to NEI
207208
* - Slimes! [LATER]
208209
* - Rice, Tea, Brewing [LATER]

src/main/java/darkbum/saltymod/block/BlockApiary.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Random;
44

5-
import darkbum.saltymod.util.BlockUtil;
5+
import darkbum.saltymod.util.BlockUtils;
66
import net.minecraft.block.Block;
77
import net.minecraft.block.BlockContainer;
88
import net.minecraft.block.material.Material;
@@ -22,7 +22,7 @@
2222
import darkbum.saltymod.SaltyMod;
2323
import darkbum.saltymod.tileentity.TileEntityApiary;
2424

25-
import static darkbum.saltymod.util.BlockUtil.*;
25+
import static darkbum.saltymod.util.BlockUtils.*;
2626

2727
/**
2828
* Block class for the apiary block.
@@ -50,7 +50,7 @@ public class BlockApiary extends BlockContainer {
5050
/**
5151
* Constructs a new block instance with a given name and a creative tab.
5252
* <p>
53-
* Also assigns a material and other base properties through {@link BlockUtil}.
53+
* Also assigns a material and other base properties through {@link BlockUtils}.
5454
*
5555
* @param name The internal name of the block.
5656
* @param tab The creative tab in which the block appears.
@@ -122,7 +122,7 @@ public TileEntity createNewTileEntity(World world, int meta) {
122122
*/
123123
@Override
124124
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
125-
BlockUtil.setBlockDirectionFromEntity(world, x, y, z, entity);
125+
BlockUtils.setBlockDirectionFromEntity(world, x, y, z, entity);
126126
}
127127

128128
/**

src/main/java/darkbum/saltymod/block/BlockBeeBurrow.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import cpw.mods.fml.common.Loader;
77
import darkbum.saltymod.init.ModBlocks;
8-
import darkbum.saltymod.util.BlockUtil;
8+
import darkbum.saltymod.util.BlockUtils;
99
import net.minecraft.block.Block;
1010
import net.minecraft.block.material.Material;
1111
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -23,7 +23,7 @@
2323
import cpw.mods.fml.relauncher.SideOnly;
2424
import darkbum.saltymod.init.ModItems;
2525

26-
import static darkbum.saltymod.util.BlockUtil.*;
26+
import static darkbum.saltymod.util.BlockUtils.*;
2727

2828
/**
2929
* Block class for the bee burrow block.
@@ -55,7 +55,7 @@ public enum BeeBurrowType {
5555
/**
5656
* Constructs a new block instance with a given name, a creative tab and a type.
5757
* <p>
58-
* Also assigns a material and other base properties through {@link BlockUtil}.
58+
* Also assigns a material and other base properties through {@link BlockUtils}.
5959
*
6060
* @param name The internal name of the block.
6161
* @param tab The creative tab in which the block appears.
@@ -166,7 +166,7 @@ private boolean tryStripBlock(World world, int x, int y, int z, EntityPlayer pla
166166

167167
if (!player.capabilities.isCreativeMode) {
168168
heldItem.damageItem(1, player);
169-
BlockUtil.applySwarmedEffect(world, player, x, y, z, 600);
169+
BlockUtils.applySwarmedEffect(world, player, x, y, z, 600);
170170
}
171171
return true;
172172
}
@@ -190,7 +190,7 @@ protected boolean canSilkHarvest() {
190190
@Override
191191
public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
192192
if (!player.capabilities.isCreativeMode) {
193-
BlockUtil.applySwarmedEffect(world, player, x, y, z, 900);
193+
BlockUtils.applySwarmedEffect(world, player, x, y, z, 900);
194194
}
195195
}
196196

src/main/java/darkbum/saltymod/block/BlockBeeNest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.Random;
55

6-
import darkbum.saltymod.util.BlockUtil;
6+
import darkbum.saltymod.util.BlockUtils;
77
import net.minecraft.block.Block;
88
import net.minecraft.block.material.Material;
99
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -20,7 +20,7 @@
2020
import cpw.mods.fml.relauncher.SideOnly;
2121
import darkbum.saltymod.init.ModItems;
2222

23-
import static darkbum.saltymod.util.BlockUtil.*;
23+
import static darkbum.saltymod.util.BlockUtils.*;
2424

2525
/**
2626
* Block class for the bee nest block.
@@ -55,7 +55,7 @@ public enum BeeNestType {
5555
/**
5656
* Constructs a new block instance with a given name, a creative tab and a type.
5757
* <p>
58-
* Also assigns a material and other base properties through {@link BlockUtil}.
58+
* Also assigns a material and other base properties through {@link BlockUtils}.
5959
*
6060
* @param name The internal name of the block.
6161
* @param tab The creative tab in which the block appears.
@@ -150,7 +150,7 @@ protected boolean canSilkHarvest() {
150150
@Override
151151
public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
152152
if (!player.capabilities.isCreativeMode) {
153-
BlockUtil.applySwarmedEffect(world, player, x, y, z, 900);
153+
BlockUtils.applySwarmedEffect(world, player, x, y, z, 900);
154154
}
155155
}
156156

src/main/java/darkbum/saltymod/block/BlockClayOven.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import cpw.mods.fml.relauncher.SideOnly;
55
import darkbum.saltymod.SaltyMod;
66
import darkbum.saltymod.tileentity.TileEntityClayOven;
7-
import darkbum.saltymod.util.BlockUtil;
7+
import darkbum.saltymod.util.BlockUtils;
88
import net.minecraft.block.Block;
99
import net.minecraft.block.BlockContainer;
1010
import net.minecraft.block.material.Material;
@@ -24,7 +24,7 @@
2424
import java.util.Random;
2525

2626
import static darkbum.saltymod.tileentity.TileEntityClayOven.*;
27-
import static darkbum.saltymod.util.BlockUtil.*;
27+
import static darkbum.saltymod.util.BlockUtils.*;
2828

2929
/**
3030
* Block class for the clay oven block.
@@ -52,7 +52,7 @@ public class BlockClayOven extends BlockContainer {
5252
/**
5353
* Constructs a new block instance with a given name and a creative tab.
5454
* <p>
55-
* Also assigns a material and other base properties through {@link BlockUtil}.
55+
* Also assigns a material and other base properties through {@link BlockUtils}.
5656
*
5757
* @param name The internal name of the block.
5858
* @param tab The creative tab in which the block appears.
@@ -192,7 +192,7 @@ public boolean canPlaceBlockAt(World world, int x, int y, int z) {
192192
*/
193193
@Override
194194
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) {
195-
BlockUtil.setBlockDirectionFromEntity(world, x, y, z, entity);
195+
BlockUtils.setBlockDirectionFromEntity(world, x, y, z, entity);
196196
}
197197

198198
/**

src/main/java/darkbum/saltymod/block/BlockCookingPot.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import darkbum.saltymod.block.render.CookingPotRenderer;
77
import darkbum.saltymod.common.proxy.ClientProxy;
88
import darkbum.saltymod.tileentity.TileEntityCookingPot;
9-
import darkbum.saltymod.util.BlockUtil;
9+
import darkbum.saltymod.util.BlockUtils;
1010
import net.minecraft.block.Block;
1111
import net.minecraft.block.BlockContainer;
1212
import net.minecraft.block.material.Material;
@@ -27,7 +27,7 @@
2727
import java.util.Random;
2828

2929
import static darkbum.saltymod.tileentity.TileEntityCookingPot.*;
30-
import static darkbum.saltymod.util.BlockUtil.*;
30+
import static darkbum.saltymod.util.BlockUtils.*;
3131

3232
/**
3333
* Block class for the cooking pot block.
@@ -58,7 +58,7 @@ public class BlockCookingPot extends BlockContainer {
5858
/**
5959
* Constructs a new block instance with a given name and a creative tab.
6060
* <p>
61-
* Also assigns a material and other base properties through {@link BlockUtil}.
61+
* Also assigns a material and other base properties through {@link BlockUtils}.
6262
*
6363
* @param name The internal name of the block.
6464
* @param tab The creative tab in which the block appears.

src/main/java/darkbum/saltymod/block/BlockDryMudBrick.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package darkbum.saltymod.block;
22

3-
import darkbum.saltymod.util.BlockUtil;
3+
import darkbum.saltymod.util.BlockUtils;
44
import net.minecraft.block.Block;
55
import net.minecraft.block.material.Material;
66
import net.minecraft.creativetab.CreativeTabs;
77

8-
import static darkbum.saltymod.util.BlockUtil.*;
8+
import static darkbum.saltymod.util.BlockUtils.*;
99

1010
/**
1111
* Block class for the dry mud brick block.
@@ -19,7 +19,7 @@ public class BlockDryMudBrick extends Block {
1919
/**
2020
* Constructs a new block instance with a given name and a creative tab.
2121
* <p>
22-
* Also assigns a material and other base properties through {@link BlockUtil}.
22+
* Also assigns a material and other base properties through {@link BlockUtils}.
2323
*
2424
* @param name The internal name of the block.
2525
* @param tab The creative tab in which the block appears.

src/main/java/darkbum/saltymod/block/BlockDryMudBrickSlab.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Random;
44

5-
import darkbum.saltymod.util.BlockUtil;
5+
import darkbum.saltymod.util.BlockUtils;
66
import net.minecraft.block.BlockSlab;
77
import net.minecraft.block.material.Material;
88
import net.minecraft.creativetab.CreativeTabs;
@@ -14,7 +14,7 @@
1414

1515
import darkbum.saltymod.init.ModBlocks;
1616

17-
import static darkbum.saltymod.util.BlockUtil.*;
17+
import static darkbum.saltymod.util.BlockUtils.*;
1818

1919
/**
2020
* Block class for the dry mud brick slab block.
@@ -28,7 +28,7 @@ public class BlockDryMudBrickSlab extends BlockSlab {
2828
/**
2929
* Constructs a new block instance with a boolean for isDouble, a given name and a creative tab.
3030
* <p>
31-
* Also assigns a material and other base properties through {@link BlockUtil}.
31+
* Also assigns a material and other base properties through {@link BlockUtils}.
3232
*
3333
* @param name The internal name of the block.
3434
* @param tab The creative tab in which the block appears.

src/main/java/darkbum/saltymod/block/BlockDryMudBrickStairs.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package darkbum.saltymod.block;
22

3-
import darkbum.saltymod.util.BlockUtil;
3+
import darkbum.saltymod.util.BlockUtils;
44
import net.minecraft.block.BlockStairs;
55
import net.minecraft.creativetab.CreativeTabs;
66

77
import darkbum.saltymod.init.ModBlocks;
88

9-
import static darkbum.saltymod.util.BlockUtil.*;
9+
import static darkbum.saltymod.util.BlockUtils.*;
1010

1111
/**
1212
* Block class for the dry mud brick stairs block.
@@ -20,7 +20,7 @@ public class BlockDryMudBrickStairs extends BlockStairs {
2020
/**
2121
* Constructs a new block instance with a given name and a creative tab.
2222
* <p>
23-
* Also assigns a material and other base properties through {@link BlockUtil}.
23+
* Also assigns a material and other base properties through {@link BlockUtils}.
2424
*
2525
* @param name The internal name of the block.
2626
* @param tab The creative tab in which the block appears.

src/main/java/darkbum/saltymod/block/BlockDryMudBrickWall.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.List;
44
import java.util.Random;
55

6-
import darkbum.saltymod.util.BlockUtil;
6+
import darkbum.saltymod.util.BlockUtils;
77
import net.minecraft.block.Block;
88
import net.minecraft.block.BlockWall;
99
import net.minecraft.creativetab.CreativeTabs;
@@ -18,7 +18,7 @@
1818
import cpw.mods.fml.relauncher.SideOnly;
1919
import darkbum.saltymod.init.ModBlocks;
2020

21-
import static darkbum.saltymod.util.BlockUtil.*;
21+
import static darkbum.saltymod.util.BlockUtils.*;
2222

2323
/**
2424
* Block class for the dry mud brick wall block.
@@ -32,7 +32,7 @@ public class BlockDryMudBrickWall extends BlockWall {
3232
/**
3333
* Constructs a new block instance with a parent block and a creative tab.
3434
* <p>
35-
* Also assigns a material and other base properties through {@link BlockUtil}.
35+
* Also assigns a material and other base properties through {@link BlockUtils}.
3636
*
3737
* @param tab The creative tab in which the block appears.
3838
*/

0 commit comments

Comments
 (0)