diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/algae.png b/src/minecraft/assets/textures/blocks/biomesoplenty/algae.png new file mode 100644 index 000000000..c876831aa Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/algae.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/aloe.png b/src/minecraft/assets/textures/blocks/biomesoplenty/aloe.png new file mode 100644 index 000000000..c30a63abb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/aloe.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/alphaore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/alphaore.png new file mode 100644 index 000000000..79fbfa338 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/alphaore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/altarframe.png b/src/minecraft/assets/textures/blocks/biomesoplenty/altarframe.png new file mode 100644 index 000000000..3164a685b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/altarframe.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/altarframetop.png b/src/minecraft/assets/textures/blocks/biomesoplenty/altarframetop.png new file mode 100644 index 000000000..94533584a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/altarframetop.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/amethystblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/amethystblock.png new file mode 100644 index 000000000..53409f41e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/amethystblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/amethystore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/amethystore.png new file mode 100644 index 000000000..ec9eca002 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/amethystore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/anemone.png b/src/minecraft/assets/textures/blocks/biomesoplenty/anemone.png new file mode 100644 index 000000000..93c84a077 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/anemone.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteblock.png new file mode 100644 index 000000000..73e79b4b8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteore.png new file mode 100644 index 000000000..bed22b254 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/apatiteore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/ashblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/ashblock.png new file mode 100644 index 000000000..af36ebf3b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/ashblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/ashstone.png b/src/minecraft/assets/textures/blocks/biomesoplenty/ashstone.png new file mode 100644 index 000000000..3a6bd877b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/ashstone.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bamboo.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bamboo.png new file mode 100644 index 000000000..cfb490fba Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bamboo.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bamboothatching.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bamboothatching.png new file mode 100644 index 000000000..6e8588db1 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bamboothatching.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/barley.png b/src/minecraft/assets/textures/blocks/biomesoplenty/barley.png new file mode 100644 index 000000000..a65ae7469 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/barley.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/berrybush.png b/src/minecraft/assets/textures/blocks/biomesoplenty/berrybush.png new file mode 100644 index 000000000..1b09126a6 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/berrybush.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerred.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerred.png new file mode 100644 index 000000000..82bd7ca3f Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerred.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_heart.png new file mode 100644 index 000000000..4f54d9abd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_side.png new file mode 100644 index 000000000..e30a40dc7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bigflowerstem_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bigfloweryellow.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bigfloweryellow.png new file mode 100644 index 000000000..5adf240cb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bigfloweryellow.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bluemilk.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bluemilk.png new file mode 100644 index 000000000..1e4a69628 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bluemilk.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bones_large.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_large.png new file mode 100644 index 000000000..9c2c95cbb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_large.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bones_medium.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_medium.png new file mode 100644 index 000000000..9c2c95cbb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_medium.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bones_small.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_small.png new file mode 100644 index 000000000..9c2c95cbb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bones_small.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/bush.png b/src/minecraft/assets/textures/blocks/biomesoplenty/bush.png new file mode 100644 index 000000000..8ed92bb0c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/bush.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cactus.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cactus.png new file mode 100644 index 000000000..a4d2b0ace Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cactus.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cattail.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cattail.png new file mode 100644 index 000000000..87a63339b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cattail.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cattailbottom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cattailbottom.png new file mode 100644 index 000000000..29dbc56c5 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cattailbottom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cattailtop.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cattailtop.png new file mode 100644 index 000000000..66c21c616 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cattailtop.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/celestiallens.png b/src/minecraft/assets/textures/blocks/biomesoplenty/celestiallens.png new file mode 100644 index 000000000..5b93b04c7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/celestiallens.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cloud.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cloud.png new file mode 100644 index 000000000..e1502f5ed Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cloud.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/clover.png b/src/minecraft/assets/textures/blocks/biomesoplenty/clover.png new file mode 100644 index 000000000..19d839345 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/clover.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cloverleaf.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cloverleaf.png new file mode 100644 index 000000000..12777ae9c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cloverleaf.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/cragrock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/cragrock.png new file mode 100644 index 000000000..ea59ce1f8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/cragrock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/crystal.png b/src/minecraft/assets/textures/blocks/biomesoplenty/crystal.png new file mode 100644 index 000000000..b32b2cc42 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/crystal.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/daisy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/daisy.png new file mode 100644 index 000000000..94f28d246 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/daisy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/dandelion.png b/src/minecraft/assets/textures/blocks/biomesoplenty/dandelion.png new file mode 100644 index 000000000..38427efd7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/dandelion.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/deadbloom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/deadbloom.png new file mode 100644 index 000000000..c83b7ce1e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/deadbloom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/deadgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/deadgrass.png new file mode 100644 index 000000000..86d64d5a8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/deadgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/desertgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/desertgrass.png new file mode 100644 index 000000000..aadf8198d Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/desertgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/desertsprouts.png b/src/minecraft/assets/textures/blocks/biomesoplenty/desertsprouts.png new file mode 100644 index 000000000..ab3775edb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/desertsprouts.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/drieddirt.png b/src/minecraft/assets/textures/blocks/biomesoplenty/drieddirt.png new file mode 100644 index 000000000..250b4c742 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/drieddirt.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/dunegrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/dunegrass.png new file mode 100644 index 000000000..880564b7e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/dunegrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/frameapatite.png b/src/minecraft/assets/textures/blocks/biomesoplenty/frameapatite.png new file mode 100644 index 000000000..ffdab84b9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/frameapatite.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/frameperidot.png b/src/minecraft/assets/textures/blocks/biomesoplenty/frameperidot.png new file mode 100644 index 000000000..db600d810 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/frameperidot.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/frameruby.png b/src/minecraft/assets/textures/blocks/biomesoplenty/frameruby.png new file mode 100644 index 000000000..fc82f455a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/frameruby.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/framesapphire.png b/src/minecraft/assets/textures/blocks/biomesoplenty/framesapphire.png new file mode 100644 index 000000000..0ed8ea605 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/framesapphire.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/frametanzanite.png b/src/minecraft/assets/textures/blocks/biomesoplenty/frametanzanite.png new file mode 100644 index 000000000..a75ca1b35 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/frametanzanite.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/frametopaz.png b/src/minecraft/assets/textures/blocks/biomesoplenty/frametopaz.png new file mode 100644 index 000000000..4dda023bb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/frametopaz.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/glowflower.png b/src/minecraft/assets/textures/blocks/biomesoplenty/glowflower.png new file mode 100644 index 000000000..0209ab085 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/glowflower.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/glowshroom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/glowshroom.png new file mode 100644 index 000000000..86747c189 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/glowshroom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/harddirt.png b/src/minecraft/assets/textures/blocks/biomesoplenty/harddirt.png new file mode 100644 index 000000000..2bc15b2ce Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/harddirt.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/hardice.png b/src/minecraft/assets/textures/blocks/biomesoplenty/hardice.png new file mode 100644 index 000000000..3ee1a9053 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/hardice.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/hardsand.png b/src/minecraft/assets/textures/blocks/biomesoplenty/hardsand.png new file mode 100644 index 000000000..adfe20302 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/hardsand.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/highgrassbottom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/highgrassbottom.png new file mode 100644 index 000000000..5011d1373 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/highgrassbottom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/highgrasstop.png b/src/minecraft/assets/textures/blocks/biomesoplenty/highgrasstop.png new file mode 100644 index 000000000..9dcc838a3 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/highgrasstop.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holybrick.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holybrick.png new file mode 100644 index 000000000..5cb0569ce Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holybrick.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holycobble.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holycobble.png new file mode 100644 index 000000000..015681d96 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holycobble.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holydirt.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holydirt.png new file mode 100644 index 000000000..c06216d04 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holydirt.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_side.png new file mode 100644 index 000000000..78c86d227 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_top.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_top.png new file mode 100644 index 000000000..7693e9240 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holygrass_top.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holystone.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holystone.png new file mode 100644 index 000000000..caa4b71f9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holystone.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/holytallgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/holytallgrass.png new file mode 100644 index 000000000..d055c2668 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/holytallgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/hydrangea.png b/src/minecraft/assets/textures/blocks/biomesoplenty/hydrangea.png new file mode 100644 index 000000000..7a4b1e9f0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/hydrangea.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_bamboo.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_bamboo.png new file mode 100644 index 000000000..73c546f31 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_bamboo.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_barley.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_barley.png new file mode 100644 index 000000000..66d2d8542 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_barley.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_berrybush.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_berrybush.png new file mode 100644 index 000000000..bfd68ecf2 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_berrybush.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_cattail.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_cattail.png new file mode 100644 index 000000000..9969871e7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_cattail.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_highgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_highgrass.png new file mode 100644 index 000000000..4511d9386 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_highgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_moss.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_moss.png new file mode 100644 index 000000000..6384ae421 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_moss.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_reed.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_reed.png new file mode 100644 index 000000000..b46401411 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_reed.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/item_sunflower.png b/src/minecraft/assets/textures/blocks/biomesoplenty/item_sunflower.png new file mode 100644 index 000000000..4e2a98e36 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/item_sunflower.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/ivy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/ivy.png new file mode 100644 index 000000000..da6565ec9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/ivy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/kelp.png b/src/minecraft/assets/textures/blocks/biomesoplenty/kelp.png new file mode 100644 index 000000000..fa041f6da Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/kelp.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fancy.png new file mode 100644 index 000000000..aadecc4cf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fast.png new file mode 100644 index 000000000..b7d562bdc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_acacia_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple.png new file mode 100644 index 000000000..24ab15feb Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fancy.png new file mode 100644 index 000000000..7bfc00860 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fast.png new file mode 100644 index 000000000..8443041e7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple0_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fancy.png new file mode 100644 index 000000000..ce41177e4 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fast.png new file mode 100644 index 000000000..79ff2a3fe Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple1_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fancy.png new file mode 100644 index 000000000..b48a3b0c4 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fast.png new file mode 100644 index 000000000..b6860965e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple2_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fancy.png new file mode 100644 index 000000000..a7bd8b858 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fast.png new file mode 100644 index 000000000..762f1c703 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_apple3_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fancy.png new file mode 100644 index 000000000..d801ac1c6 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fast.png new file mode 100644 index 000000000..4a44f20ff Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_bamboo_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fancy.png new file mode 100644 index 000000000..f7186c6cc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fast.png new file mode 100644 index 000000000..c95ffb8fd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dark_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fancy.png new file mode 100644 index 000000000..5c57a4e6a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fast.png new file mode 100644 index 000000000..689efeeaf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_dead_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fancy.png new file mode 100644 index 000000000..df10e34b7 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fast.png new file mode 100644 index 000000000..6187f5e63 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_fir_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fancy.png new file mode 100644 index 000000000..96073a62c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fast.png new file mode 100644 index 000000000..ee9456781 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_hellbark_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fancy.png new file mode 100644 index 000000000..0db0e085d Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fast.png new file mode 100644 index 000000000..dd53027df Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_holy_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fancy.png new file mode 100644 index 000000000..c77015398 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fast.png new file mode 100644 index 000000000..6398e701a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_jacaranda_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fancy.png new file mode 100644 index 000000000..0d0f65d3b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fast.png new file mode 100644 index 000000000..60b51c170 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_magic_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fancy.png new file mode 100644 index 000000000..ffdfe9208 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fast.png new file mode 100644 index 000000000..5aaaccd23 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_mangrove_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fancy.png new file mode 100644 index 000000000..be1776c66 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fast.png new file mode 100644 index 000000000..84ca178e8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_maple_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fancy.png new file mode 100644 index 000000000..77cb3f13a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fast.png new file mode 100644 index 000000000..2de303cdd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_orangeautumn_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fancy.png new file mode 100644 index 000000000..e85b98708 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fast.png new file mode 100644 index 000000000..13a33204f Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_origin_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fancy.png new file mode 100644 index 000000000..7da08a2e8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fast.png new file mode 100644 index 000000000..f37d28cff Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_palm_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fancy.png new file mode 100644 index 000000000..bd3217338 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fast.png new file mode 100644 index 000000000..0287c79ca Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pine_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fancy.png new file mode 100644 index 000000000..07750181e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fast.png new file mode 100644 index 000000000..10bbf528c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_pinkcherry_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fancy.png new file mode 100644 index 000000000..34892b301 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fast.png new file mode 100644 index 000000000..c42d197e2 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_redwood_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fancy.png new file mode 100644 index 000000000..e30868a81 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fast.png new file mode 100644 index 000000000..b310a091c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_whitecherry_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fancy.png new file mode 100644 index 000000000..885f4082c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fast.png new file mode 100644 index 000000000..c92e2e191 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_willow_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fancy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fancy.png new file mode 100644 index 000000000..badf7256a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fancy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fast.png b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fast.png new file mode 100644 index 000000000..0c738dedd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/leaves_yellowautumn_fast.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/lilyflower.png b/src/minecraft/assets/textures/blocks/biomesoplenty/lilyflower.png new file mode 100644 index 000000000..07eec7ac4 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/lilyflower.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_flowing.png b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_flowing.png new file mode 100644 index 000000000..37fc7b0f9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_flowing.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_flowing.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_flowing.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.png b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.png new file mode 100644 index 000000000..2f612feca Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.txt new file mode 100644 index 000000000..55f2f4d6f --- /dev/null +++ b/src/minecraft/assets/textures/blocks/biomesoplenty/liquid_poison_still.txt @@ -0,0 +1,33 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 + diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_side.png new file mode 100644 index 000000000..dfd64fd8e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_acacia_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_side.png new file mode 100644 index 000000000..5ea030471 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_cherry_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_side.png new file mode 100644 index 000000000..4720da6a8 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dark_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_side.png new file mode 100644 index 000000000..40d9b34cc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_dead_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_side.png new file mode 100644 index 000000000..97eda2457 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_fir_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_heart.png new file mode 100644 index 000000000..7a44e7730 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_side.png new file mode 100644 index 000000000..d73ca1951 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_hellbark_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_side.png new file mode 100644 index 000000000..9ecb62689 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_holy_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_heart.png new file mode 100644 index 000000000..7a44e7730 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_side.png new file mode 100644 index 000000000..880e6e6f5 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_jacaranda_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_side.png new file mode 100644 index 000000000..612a37a97 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_magic_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_side.png new file mode 100644 index 000000000..dbd6df74c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_mangrove_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_side.png new file mode 100644 index 000000000..50c804b2d Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_palm_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_heart.png new file mode 100644 index 000000000..7a44e7730 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_side.png new file mode 100644 index 000000000..fb50ee9c4 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_pine_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_side.png new file mode 100644 index 000000000..19ea81aef Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_redwood_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_heart.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_heart.png new file mode 100644 index 000000000..e926b0a69 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_heart.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_side.png new file mode 100644 index 000000000..9ef2ad823 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/log_willow_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/mediumgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/mediumgrass.png new file mode 100644 index 000000000..2b93087a6 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/mediumgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/moss.png b/src/minecraft/assets/textures/blocks/biomesoplenty/moss.png new file mode 100644 index 000000000..19df3c12d Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/moss.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/mud.png b/src/minecraft/assets/textures/blocks/biomesoplenty/mud.png new file mode 100644 index 000000000..fd2011fc6 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/mud.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/mudbrick.png b/src/minecraft/assets/textures/blocks/biomesoplenty/mudbrick.png new file mode 100644 index 000000000..04f70770e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/mudbrick.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/omegaore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/omegaore.png new file mode 100644 index 000000000..72c3c2123 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/omegaore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/originbricks.png b/src/minecraft/assets/textures/blocks/biomesoplenty/originbricks.png new file mode 100644 index 000000000..8507036a0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/originbricks.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/origincobble.png b/src/minecraft/assets/textures/blocks/biomesoplenty/origincobble.png new file mode 100644 index 000000000..2876b635c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/origincobble.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass1.png b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass1.png new file mode 100644 index 000000000..0e0a6bbf1 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass1.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass2.png b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass2.png new file mode 100644 index 000000000..ff32f30e4 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass2.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass3.png b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass3.png new file mode 100644 index 000000000..504a6c671 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/origingrass3.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/origingravel.png b/src/minecraft/assets/textures/blocks/biomesoplenty/origingravel.png new file mode 100644 index 000000000..c2ad500bf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/origingravel.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/originlappis.png b/src/minecraft/assets/textures/blocks/biomesoplenty/originlappis.png new file mode 100644 index 000000000..682f68176 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/originlappis.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/originmossycobble.png b/src/minecraft/assets/textures/blocks/biomesoplenty/originmossycobble.png new file mode 100644 index 000000000..21d4f0e58 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/originmossycobble.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/originplanks.png b/src/minecraft/assets/textures/blocks/biomesoplenty/originplanks.png new file mode 100644 index 000000000..f562db79c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/originplanks.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/peridotblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/peridotblock.png new file mode 100644 index 000000000..a3b18d719 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/peridotblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/peridotore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/peridotore.png new file mode 100644 index 000000000..59b18dc56 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/peridotore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_acacia.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_acacia.png new file mode 100644 index 000000000..b0bf13a5d Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_acacia.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_cherry.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_cherry.png new file mode 100644 index 000000000..ed16e2492 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_cherry.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_dark.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_dark.png new file mode 100644 index 000000000..466a79228 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_dark.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_fir.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_fir.png new file mode 100644 index 000000000..b4b19c59b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_fir.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_hell_bark.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_hell_bark.png new file mode 100644 index 000000000..cf091ea6b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_hell_bark.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_holy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_holy.png new file mode 100644 index 000000000..62cb1372f Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_holy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_jacaranda.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_jacaranda.png new file mode 100644 index 000000000..5b3861e67 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_jacaranda.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_magic.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_magic.png new file mode 100644 index 000000000..f90682b96 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_magic.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_mangrove.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_mangrove.png new file mode 100644 index 000000000..959f52686 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_mangrove.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_palm.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_palm.png new file mode 100644 index 000000000..9fcbdd452 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_palm.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_pine.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_pine.png new file mode 100644 index 000000000..fe75a7aff Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_pine.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_redwood.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_redwood.png new file mode 100644 index 000000000..c46e1c155 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_redwood.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/plank_willow.png b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_willow.png new file mode 100644 index 000000000..ba7d336f0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/plank_willow.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/poisonivy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/poisonivy.png new file mode 100644 index 000000000..385ab819c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/poisonivy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/portal.png b/src/minecraft/assets/textures/blocks/biomesoplenty/portal.png new file mode 100644 index 000000000..cc6dad18a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/portal.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/portobello.png b/src/minecraft/assets/textures/blocks/biomesoplenty/portobello.png new file mode 100644 index 000000000..85f8800f9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/portobello.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/quicksand.png b/src/minecraft/assets/textures/blocks/biomesoplenty/quicksand.png new file mode 100644 index 000000000..1a7f37809 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/quicksand.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/redbrick.png b/src/minecraft/assets/textures/blocks/biomesoplenty/redbrick.png new file mode 100644 index 000000000..e8482f772 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/redbrick.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/redcobble.png b/src/minecraft/assets/textures/blocks/biomesoplenty/redcobble.png new file mode 100644 index 000000000..f355448fc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/redcobble.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/redrock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/redrock.png new file mode 100644 index 000000000..18e99b5d0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/redrock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/reed.png b/src/minecraft/assets/textures/blocks/biomesoplenty/reed.png new file mode 100644 index 000000000..884a55386 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/reed.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/rubyblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/rubyblock.png new file mode 100644 index 000000000..8a1423b12 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/rubyblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/rubyore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/rubyore.png new file mode 100644 index 000000000..eb7862aa5 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/rubyore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.png new file mode 100644 index 000000000..73708a331 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.txt new file mode 100644 index 000000000..35163c55b --- /dev/null +++ b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_active.txt @@ -0,0 +1,9 @@ +0*20 +1*1 +2*1 +3*1 +4*6 +3*1 +2*1 +1*1 +0*20 diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_empty.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_empty.png new file mode 100644 index 000000000..a8b4e1fbf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_empty.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.png new file mode 100644 index 000000000..b05d1416e Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.txt new file mode 100644 index 000000000..35163c55b --- /dev/null +++ b/src/minecraft/assets/textures/blocks/biomesoplenty/sacrificialfocus_villager.txt @@ -0,0 +1,9 @@ +0*20 +1*1 +2*1 +3*1 +4*6 +3*1 +2*1 +1*1 +0*20 diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_acacia.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_acacia.png new file mode 100644 index 000000000..8c92a5033 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_acacia.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_apple.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_apple.png new file mode 100644 index 000000000..e126e65ed Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_apple.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_bamboo.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_bamboo.png new file mode 100644 index 000000000..e342ea25c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_bamboo.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dark.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dark.png new file mode 100644 index 000000000..943985a1f Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dark.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dead.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dead.png new file mode 100644 index 000000000..47aee006c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_dead.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_fir.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_fir.png new file mode 100644 index 000000000..9c2ac4d73 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_fir.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_hellbark.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_hellbark.png new file mode 100644 index 000000000..9a7be53e0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_hellbark.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_holy.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_holy.png new file mode 100644 index 000000000..57918c583 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_holy.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_jacaranda.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_jacaranda.png new file mode 100644 index 000000000..f452458db Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_jacaranda.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_magic.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_magic.png new file mode 100644 index 000000000..699e58c9b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_magic.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_mangrove.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_mangrove.png new file mode 100644 index 000000000..52b89f735 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_mangrove.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_maple.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_maple.png new file mode 100644 index 000000000..b290027bf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_maple.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_orangeautumn.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_orangeautumn.png new file mode 100644 index 000000000..97508348a Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_orangeautumn.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_origin.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_origin.png new file mode 100644 index 000000000..28df09475 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_origin.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_palm.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_palm.png new file mode 100644 index 000000000..7f1fcdefc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_palm.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pine.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pine.png new file mode 100644 index 000000000..b0a540551 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pine.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pinkcherry.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pinkcherry.png new file mode 100644 index 000000000..90b2d5d95 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_pinkcherry.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_redwood.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_redwood.png new file mode 100644 index 000000000..3beaca6bc Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_redwood.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_whitecherry.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_whitecherry.png new file mode 100644 index 000000000..6b6a84546 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_whitecherry.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_willow.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_willow.png new file mode 100644 index 000000000..8e5ffadf0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_willow.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_yellowautumn.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_yellowautumn.png new file mode 100644 index 000000000..c53598c48 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapling_yellowautumn.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireblock.png new file mode 100644 index 000000000..03c36874f Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireore.png new file mode 100644 index 000000000..e83170482 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sapphireore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/shortgrass.png b/src/minecraft/assets/textures/blocks/biomesoplenty/shortgrass.png new file mode 100644 index 000000000..a9054de6c Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/shortgrass.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_bottom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_bottom.png new file mode 100644 index 000000000..358414200 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_bottom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_side.png b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_side.png new file mode 100644 index 000000000..46c0ab0c5 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_side.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_top.png b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_top.png new file mode 100644 index 000000000..15f8a1607 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/smolderinggrass_top.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_flowing.png b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_flowing.png new file mode 100644 index 000000000..c1a3e7faf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_flowing.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_flowing.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_flowing.txt new file mode 100644 index 000000000..e69de29bb diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.png b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.png new file mode 100644 index 000000000..cc2393a71 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.txt b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.txt new file mode 100644 index 000000000..d8fe765a9 --- /dev/null +++ b/src/minecraft/assets/textures/blocks/biomesoplenty/spring_water_still.txt @@ -0,0 +1,32 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sprout.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sprout.png new file mode 100644 index 000000000..b9f6359f6 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sprout.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowerbottom.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowerbottom.png new file mode 100644 index 000000000..93282efa0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowerbottom.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowertop.png b/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowertop.png new file mode 100644 index 000000000..4ca81799b Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/sunflowertop.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/swampflower.png b/src/minecraft/assets/textures/blocks/biomesoplenty/swampflower.png new file mode 100644 index 000000000..722d14056 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/swampflower.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteblock.png new file mode 100644 index 000000000..25ac71cbd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteore.png new file mode 100644 index 000000000..e991c8eaf Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/tanzaniteore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/thorn.png b/src/minecraft/assets/textures/blocks/biomesoplenty/thorn.png new file mode 100644 index 000000000..8b7653f97 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/thorn.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/toadstool.png b/src/minecraft/assets/textures/blocks/biomesoplenty/toadstool.png new file mode 100644 index 000000000..d35f2d131 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/toadstool.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/topazblock.png b/src/minecraft/assets/textures/blocks/biomesoplenty/topazblock.png new file mode 100644 index 000000000..2c07b9833 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/topazblock.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/topazore.png b/src/minecraft/assets/textures/blocks/biomesoplenty/topazore.png new file mode 100644 index 000000000..5d2af26dd Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/topazore.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/treemoss.png b/src/minecraft/assets/textures/blocks/biomesoplenty/treemoss.png new file mode 100644 index 000000000..c1c100d16 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/treemoss.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/tulip.png b/src/minecraft/assets/textures/blocks/biomesoplenty/tulip.png new file mode 100644 index 000000000..4403c18d0 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/tulip.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/violet.png b/src/minecraft/assets/textures/blocks/biomesoplenty/violet.png new file mode 100644 index 000000000..0daff8df9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/violet.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/wildflower.png b/src/minecraft/assets/textures/blocks/biomesoplenty/wildflower.png new file mode 100644 index 000000000..1141af3d9 Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/wildflower.png differ diff --git a/src/minecraft/assets/textures/blocks/biomesoplenty/willow.png b/src/minecraft/assets/textures/blocks/biomesoplenty/willow.png new file mode 100644 index 000000000..86ad9f8de Binary files /dev/null and b/src/minecraft/assets/textures/blocks/biomesoplenty/willow.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethyst.png b/src/minecraft/assets/textures/items/biomesoplenty/amethyst.png new file mode 100644 index 000000000..32ca8e694 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethyst.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystaxe.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystaxe.png new file mode 100644 index 000000000..d51c57735 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystaxe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystboots.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystboots.png new file mode 100644 index 000000000..2bdff4add Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystboots.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystchestplate.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystchestplate.png new file mode 100644 index 000000000..8e4e1cbe3 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystchestplate.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethysthelmet.png b/src/minecraft/assets/textures/items/biomesoplenty/amethysthelmet.png new file mode 100644 index 000000000..500a74aca Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethysthelmet.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethysthoe.png b/src/minecraft/assets/textures/items/biomesoplenty/amethysthoe.png new file mode 100644 index 000000000..29fc6544b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethysthoe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystleggings.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystleggings.png new file mode 100644 index 000000000..d95337a58 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystleggings.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystpickaxe.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystpickaxe.png new file mode 100644 index 000000000..cc0d60048 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystpickaxe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystscythe.png new file mode 100644 index 000000000..217ccda8d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystscythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystshovel.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystshovel.png new file mode 100644 index 000000000..33ba55820 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystshovel.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/amethystsword.png b/src/minecraft/assets/textures/items/biomesoplenty/amethystsword.png new file mode 100644 index 000000000..10caa319b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/amethystsword.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ancientstaff.png b/src/minecraft/assets/textures/items/biomesoplenty/ancientstaff.png new file mode 100644 index 000000000..8f99daa36 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ancientstaff.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ancientstaffbroken.png b/src/minecraft/assets/textures/items/biomesoplenty/ancientstaffbroken.png new file mode 100644 index 000000000..50f3d051b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ancientstaffbroken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/apatite.png b/src/minecraft/assets/textures/items/biomesoplenty/apatite.png new file mode 100644 index 000000000..8596e139e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/apatite.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ash.png b/src/minecraft/assets/textures/items/biomesoplenty/ash.png new file mode 100644 index 000000000..21a68d94e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ash.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_handle.png new file mode 100755 index 000000000..983ea25eb Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head.png new file mode 100755 index 000000000..5b820e241 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head_broken.png new file mode 100755 index 000000000..4f5f1b56f Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/axe/alumite_axe_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_back.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_back.png new file mode 100755 index 000000000..00bc7077b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_back.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_backhead.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_backhead.png new file mode 100755 index 000000000..c3cfcade0 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_backhead.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_binding.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_binding.png new file mode 100755 index 000000000..00bc7077b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_binding.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_front.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_front.png new file mode 100755 index 000000000..a4fafb83d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_front.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead.png new file mode 100755 index 000000000..a4fafb83d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead_broken.png new file mode 100755 index 000000000..7eab77041 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_fronthead_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_handle.png new file mode 100755 index 000000000..c0653a954 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head.png new file mode 100755 index 000000000..c3cfcade0 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head_broken.png new file mode 100755 index 000000000..7eab77041 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battleaxe/amethyst_battleaxe_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_handle.png new file mode 100755 index 000000000..8b43760bf Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head.png b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head.png new file mode 100755 index 000000000..1380200f6 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head_broken.png new file mode 100755 index 000000000..1f120508c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/battlesign/amethyst_battlesign_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/berries.png b/src/minecraft/assets/textures/items/biomesoplenty/berries.png new file mode 100644 index 000000000..bb9e7149b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/berries.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/blackdye.png b/src/minecraft/assets/textures/items/biomesoplenty/blackdye.png new file mode 100644 index 000000000..8c6a6a6eb Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/blackdye.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/bluedye.png b/src/minecraft/assets/textures/items/biomesoplenty/bluedye.png new file mode 100644 index 000000000..846587b65 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/bluedye.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/boprecord.png b/src/minecraft/assets/textures/items/biomesoplenty/boprecord.png new file mode 100644 index 000000000..3bb6f6b44 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/boprecord.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_accessory.png new file mode 100755 index 000000000..44fc42f72 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade.png new file mode 100755 index 000000000..f78c3bb19 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade_broken.png new file mode 100755 index 000000000..3e1fdc8f1 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_blade_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_handle.png new file mode 100755 index 000000000..30efa5c41 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/broadsword/amethyst_sword_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/browndye.png b/src/minecraft/assets/textures/items/biomesoplenty/browndye.png new file mode 100644 index 000000000..fcac6bf92 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/browndye.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/bucket_liquid_poison.png b/src/minecraft/assets/textures/items/biomesoplenty/bucket_liquid_poison.png new file mode 100644 index 000000000..2f742c439 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/bucket_liquid_poison.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/bucket_spring_water.png b/src/minecraft/assets/textures/items/biomesoplenty/bucket_spring_water.png new file mode 100644 index 000000000..73a2629d2 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/bucket_spring_water.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_handle.png new file mode 100755 index 000000000..7de2e3684 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head.png b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head.png new file mode 100755 index 000000000..7a7e80028 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head_broken.png new file mode 100755 index 000000000..151a0082c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/chisel/amethyst_chisel_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_guard.png b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_guard.png new file mode 100755 index 000000000..ebe100461 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_guard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_handle.png new file mode 100755 index 000000000..1ad513a05 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head.png b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head.png new file mode 100755 index 000000000..e65ce18dd Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head_broken.png new file mode 100755 index 000000000..3c36faf3f Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_shield.png b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_shield.png new file mode 100755 index 000000000..fdb46f6c0 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cleaver/amethyst_cleaver_shield.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/crystalshard.png b/src/minecraft/assets/textures/items/biomesoplenty/crystalshard.png new file mode 100644 index 000000000..aa4cf1b2d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/crystalshard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade.png new file mode 100755 index 000000000..2f8801e90 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade_broken.png new file mode 100755 index 000000000..1ce29b226 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_blade_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_guard.png b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_guard.png new file mode 100755 index 000000000..e9d2ec59f Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_guard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_handle.png new file mode 100755 index 000000000..4614db03c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/cutlass/amethyst_cutlass_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_accessory.png new file mode 100755 index 000000000..abdea45ff Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade.png new file mode 100755 index 000000000..71a7902ef Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade_broken.png new file mode 100755 index 000000000..745053c60 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_blade_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_handle.png new file mode 100755 index 000000000..3d73dba7d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dagger/amethyst_dagger_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dart.png b/src/minecraft/assets/textures/items/biomesoplenty/dart.png new file mode 100644 index 000000000..c606f3034 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dart.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dartblower.png b/src/minecraft/assets/textures/items/biomesoplenty/dartblower.png new file mode 100644 index 000000000..7c0fbb8b9 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dartblower.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/diamondscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/diamondscythe.png new file mode 100644 index 000000000..0feac5021 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/diamondscythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/dullflowerband.png b/src/minecraft/assets/textures/items/biomesoplenty/dullflowerband.png new file mode 100644 index 000000000..a806fb62d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/dullflowerband.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/enderporter.png b/src/minecraft/assets/textures/items/biomesoplenty/enderporter.png new file mode 100644 index 000000000..78a5418dc Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/enderporter.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_binding.png b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_binding.png new file mode 100755 index 000000000..b6ba71392 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_binding.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_grip.png b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_grip.png new file mode 100755 index 000000000..192725bbb Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_grip.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_handle.png new file mode 100755 index 000000000..ead7b44cb Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head.png b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head.png new file mode 100755 index 000000000..1367677d8 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head_broken.png new file mode 100755 index 000000000..c9ca0b9d8 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/excavator/amethyst_excavator_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/exoticflowerband.png b/src/minecraft/assets/textures/items/biomesoplenty/exoticflowerband.png new file mode 100644 index 000000000..4f43fe71e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/exoticflowerband.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_handle.png new file mode 100755 index 000000000..978e34181 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head.png b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head.png new file mode 100755 index 000000000..4c625f641 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head_broken.png new file mode 100755 index 000000000..733ce65ee Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/frypan/amethyst_frypan_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ghastlysoul.png b/src/minecraft/assets/textures/items/biomesoplenty/ghastlysoul.png new file mode 100644 index 000000000..21847a850 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ghastlysoul.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/goldscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/goldscythe.png new file mode 100644 index 000000000..89c9932ea Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/goldscythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/greendye.png b/src/minecraft/assets/textures/items/biomesoplenty/greendye.png new file mode 100644 index 000000000..0d65f687e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/greendye.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_back.png b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_back.png new file mode 100755 index 000000000..6b0717881 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_back.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_front.png b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_front.png new file mode 100755 index 000000000..fdb4bfd02 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_front.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle.png new file mode 100755 index 000000000..099a0172e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle_broken.png new file mode 100755 index 000000000..9f5780780 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_handle_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_head.png b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_head.png new file mode 100755 index 000000000..d716c4744 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/hammer/amethyst_hammer_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ironscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/ironscythe.png new file mode 100644 index 000000000..80310fa4f Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ironscythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_accessory.png new file mode 100755 index 000000000..62777eeb8 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade.png new file mode 100755 index 000000000..4452b6960 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade_broken.png new file mode 100755 index 000000000..25c0f5a09 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_blade_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_handle.png new file mode 100755 index 000000000..a9b2b27f7 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/longsword/amethyst_longsword_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_binding.png b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_binding.png new file mode 100755 index 000000000..2ca79fb99 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_binding.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_handle.png new file mode 100755 index 000000000..efe665d09 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head.png new file mode 100755 index 000000000..0644091e8 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head_broken.png new file mode 100755 index 000000000..d9957c271 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_shield.png b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_shield.png new file mode 100755 index 000000000..c0c1899e4 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lumberaxe/amethyst_lumberaxe_shield.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/lushflowerband.png b/src/minecraft/assets/textures/items/biomesoplenty/lushflowerband.png new file mode 100644 index 000000000..9045fdc4c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/lushflowerband.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_back.png b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_back.png new file mode 100755 index 000000000..20155eb5a Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_back.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_handle.png new file mode 100755 index 000000000..e750f7248 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head.png b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head.png new file mode 100755 index 000000000..91a2c4554 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head_broken.png new file mode 100755 index 000000000..4828acd06 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mattock/amethyst_mattock_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudaxe.png b/src/minecraft/assets/textures/items/biomesoplenty/mudaxe.png new file mode 100644 index 000000000..7b6af1c5e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudaxe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudball.png b/src/minecraft/assets/textures/items/biomesoplenty/mudball.png new file mode 100644 index 000000000..a93d2920c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudball.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudboots.png b/src/minecraft/assets/textures/items/biomesoplenty/mudboots.png new file mode 100644 index 000000000..168a40333 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudboots.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudbrick.png b/src/minecraft/assets/textures/items/biomesoplenty/mudbrick.png new file mode 100644 index 000000000..cb73322f3 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudbrick.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudchestplate.png b/src/minecraft/assets/textures/items/biomesoplenty/mudchestplate.png new file mode 100644 index 000000000..144564179 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudchestplate.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudhelmet.png b/src/minecraft/assets/textures/items/biomesoplenty/mudhelmet.png new file mode 100644 index 000000000..b2ed0bd61 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudhelmet.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudhoe.png b/src/minecraft/assets/textures/items/biomesoplenty/mudhoe.png new file mode 100644 index 000000000..156f16684 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudhoe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudleggings.png b/src/minecraft/assets/textures/items/biomesoplenty/mudleggings.png new file mode 100644 index 000000000..3e999bd74 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudleggings.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudpickaxe.png b/src/minecraft/assets/textures/items/biomesoplenty/mudpickaxe.png new file mode 100644 index 000000000..7a6de1b7e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudpickaxe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudrecord.png b/src/minecraft/assets/textures/items/biomesoplenty/mudrecord.png new file mode 100644 index 000000000..77be79663 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudrecord.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/mudscythe.png new file mode 100644 index 000000000..58579b5b3 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudscythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudshovel.png b/src/minecraft/assets/textures/items/biomesoplenty/mudshovel.png new file mode 100644 index 000000000..866f55156 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudshovel.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/mudsword.png b/src/minecraft/assets/textures/items/biomesoplenty/mudsword.png new file mode 100644 index 000000000..993d01962 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/mudsword.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_axe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_axe_head.png new file mode 100755 index 000000000..1b4674201 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_axe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_battlesign_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_battlesign_head.png new file mode 100755 index 000000000..c7780cbba Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_battlesign_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_binding.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_binding.png new file mode 100755 index 000000000..a3acce5e8 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_binding.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chisel_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chisel_head.png new file mode 100755 index 000000000..bbff9ae2c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chisel_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chunk.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chunk.png new file mode 100755 index 000000000..59cad63b6 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_chunk.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_crossbar.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_crossbar.png new file mode 100755 index 000000000..467e4f129 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_crossbar.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_excavator_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_excavator_head.png new file mode 100755 index 000000000..e6950270a Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_excavator_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_frypan_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_frypan_head.png new file mode 100755 index 000000000..ba5c762ae Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_frypan_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_full_guard.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_full_guard.png new file mode 100755 index 000000000..e05fef77d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_full_guard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_hammer_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_hammer_head.png new file mode 100755 index 000000000..ad77dc66b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_hammer_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_knife_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_knife_blade.png new file mode 100755 index 000000000..dca867d0d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_knife_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_guard.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_guard.png new file mode 100755 index 000000000..6fa5f4f68 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_guard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_sword_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_sword_blade.png new file mode 100755 index 000000000..e2b674f0d Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_large_sword_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_largeplate.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_largeplate.png new file mode 100755 index 000000000..f94f069e6 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_largeplate.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_lumberaxe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_lumberaxe_head.png new file mode 100755 index 000000000..045210612 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_lumberaxe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_medium_guard.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_medium_guard.png new file mode 100755 index 000000000..bd18f4ea1 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_medium_guard.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_pickaxe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_pickaxe_head.png new file mode 100755 index 000000000..f8b141cc2 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_pickaxe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_rod.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_rod.png new file mode 100755 index 000000000..09e8e0489 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_rod.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_scythe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_scythe_head.png new file mode 100755 index 000000000..3b841cd86 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_scythe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_shovel_head.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_shovel_head.png new file mode 100755 index 000000000..3ae87129c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_shovel_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_sword_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_sword_blade.png new file mode 100755 index 000000000..6c7984457 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_sword_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughbind.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughbind.png new file mode 100755 index 000000000..4a1c09768 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughbind.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughrod.png b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughrod.png new file mode 100755 index 000000000..14af1854c Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/parts/amethyst_toughrod.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/peridot.png b/src/minecraft/assets/textures/items/biomesoplenty/peridot.png new file mode 100644 index 000000000..f0b30a5a9 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/peridot.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_accessory.png new file mode 100755 index 000000000..555eda0b5 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_handle.png new file mode 100755 index 000000000..2234e6c32 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head.png new file mode 100755 index 000000000..afe316de9 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head_broken.png new file mode 100755 index 000000000..afe6ed610 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/pickaxe/amethyst_pickaxe_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/plainflowerband.png b/src/minecraft/assets/textures/items/biomesoplenty/plainflowerband.png new file mode 100644 index 000000000..94cb1c9cf Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/plainflowerband.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/poison.png b/src/minecraft/assets/textures/items/biomesoplenty/poison.png new file mode 100644 index 000000000..9e1507f8f Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/poison.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/poisondart.png b/src/minecraft/assets/textures/items/biomesoplenty/poisondart.png new file mode 100644 index 000000000..35d2c3060 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/poisondart.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_accessory.png new file mode 100755 index 000000000..e22afe9ed Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade.png b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade.png new file mode 100755 index 000000000..9e43e729b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade_broken.png new file mode 100755 index 000000000..06085140b Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_blade_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_handle.png new file mode 100755 index 000000000..0dfb04c25 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/rapier/alumite_rapier_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/ruby.png b/src/minecraft/assets/textures/items/biomesoplenty/ruby.png new file mode 100644 index 000000000..478968ec3 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/ruby.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/sapphire.png b/src/minecraft/assets/textures/items/biomesoplenty/sapphire.png new file mode 100644 index 000000000..c36f770ef Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/sapphire.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_accessory.png b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_accessory.png new file mode 100755 index 000000000..4b653ded9 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_accessory.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_binding.png b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_binding.png new file mode 100755 index 000000000..f7ad4e2c1 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_binding.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_handle.png new file mode 100755 index 000000000..908797d14 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head.png b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head.png new file mode 100755 index 000000000..78edf56bf Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head_broken.png new file mode 100755 index 000000000..6d8fa4dae Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/scythe/alumite_scythe_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_handle.png b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_handle.png new file mode 100755 index 000000000..9219fc759 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_handle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head.png b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head.png new file mode 100755 index 000000000..918ca7b73 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head_broken.png b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head_broken.png new file mode 100755 index 000000000..e21f5f243 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/shovel/alumite_shovel_head_broken.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/shroompowder.png b/src/minecraft/assets/textures/items/biomesoplenty/shroompowder.png new file mode 100644 index 000000000..5842bffd5 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/shroompowder.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_empty.png b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_empty.png new file mode 100644 index 000000000..beb997805 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_empty.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_ghastlysoul.png b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_ghastlysoul.png new file mode 100644 index 000000000..e86317d76 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_ghastlysoul.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_villager.png b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_villager.png new file mode 100644 index 000000000..f10e12b36 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/soulmanipulator_villager.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/staffhandle.png b/src/minecraft/assets/textures/items/biomesoplenty/staffhandle.png new file mode 100644 index 000000000..2283b1c82 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/staffhandle.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/staffpole.png b/src/minecraft/assets/textures/items/biomesoplenty/staffpole.png new file mode 100644 index 000000000..caa956e2e Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/staffpole.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/stafftopper.png b/src/minecraft/assets/textures/items/biomesoplenty/stafftopper.png new file mode 100644 index 000000000..dfd9d2938 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/stafftopper.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/stonescythe.png b/src/minecraft/assets/textures/items/biomesoplenty/stonescythe.png new file mode 100644 index 000000000..da970304a Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/stonescythe.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/sunflowerseeds.png b/src/minecraft/assets/textures/items/biomesoplenty/sunflowerseeds.png new file mode 100644 index 000000000..305a63964 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/sunflowerseeds.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/tanzanite.png b/src/minecraft/assets/textures/items/biomesoplenty/tanzanite.png new file mode 100644 index 000000000..2e7f06786 Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/tanzanite.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/topaz.png b/src/minecraft/assets/textures/items/biomesoplenty/topaz.png new file mode 100644 index 000000000..aaaeebcbb Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/topaz.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/whitedye.png b/src/minecraft/assets/textures/items/biomesoplenty/whitedye.png new file mode 100644 index 000000000..18c54bbcd Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/whitedye.png differ diff --git a/src/minecraft/assets/textures/items/biomesoplenty/woodscythe.png b/src/minecraft/assets/textures/items/biomesoplenty/woodscythe.png new file mode 100644 index 000000000..b8cfd69ba Binary files /dev/null and b/src/minecraft/assets/textures/items/biomesoplenty/woodscythe.png differ diff --git a/src/minecraft/biomesoplenty/BiomesOPlenty.java b/src/minecraft/biomesoplenty/BiomesOPlenty.java index 73d0123e9..f54234801 100644 --- a/src/minecraft/biomesoplenty/BiomesOPlenty.java +++ b/src/minecraft/biomesoplenty/BiomesOPlenty.java @@ -30,6 +30,7 @@ import biomesoplenty.world.WorldProviderBOPhell; import biomesoplenty.world.WorldProviderPromised; import biomesoplenty.world.WorldTypeSize; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.PostInit; diff --git a/src/minecraft/biomesoplenty/ClientProxy.java b/src/minecraft/biomesoplenty/ClientProxy.java index fcd76d6d8..96e42407a 100644 --- a/src/minecraft/biomesoplenty/ClientProxy.java +++ b/src/minecraft/biomesoplenty/ClientProxy.java @@ -68,9 +68,9 @@ public class ClientProxy extends CommonProxy { EntityFX entityfx = null; if (string == "mud") { - entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.mudball.get(), mc.renderEngine); + entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.mudball.get()); } else if (string == "dart") { - entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.dart.get(), mc.renderEngine); + entityfx = new EntityBreakingFX(mc.theWorld, x, y, z, Items.dart.get()); } else if (string == "dandelion") { entityfx = new EntityDandelionFX(mc.theWorld, x, y, z, 2.0F); } else if (string == "steam") { diff --git a/src/minecraft/biomesoplenty/blocks/BlockGrave.java b/src/minecraft/biomesoplenty/blocks/BlockGrave.java index 4d984a7c3..f83313958 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockGrave.java +++ b/src/minecraft/biomesoplenty/blocks/BlockGrave.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; @@ -24,8 +24,9 @@ public class BlockGrave extends Block setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entity, ItemStack itemstack) + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemstack) { int o = ((MathHelper.floor_double((double)(entity.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; int fO; @@ -60,7 +61,7 @@ public class BlockGrave extends Block double d1 = (double)y + ((double)k1 + 0.5D) / (double)b0; double d2 = (double)z + ((double)l1 + 0.5D) / (double)b0; int i2 = world.rand.nextInt(6); - effectRenderer.addEffect(new EntityDiggingFX(world, d0, d1, d2, d0 - (double)x - 0.5D, d1 - (double)y - 0.5D, d2 - (double)z - 0.5D, Block.stone, i2, meta, FMLClientHandler.instance().getClient().renderEngine).func_70596_a(x, y, z)); + effectRenderer.addEffect(new EntityDiggingFX(world, d0, d1, d2, d0 - (double)x - 0.5D, d1 - (double)y - 0.5D, d2 - (double)z - 0.5D, Block.stone, i2, meta).func_70596_a(x, y, z)); } } } diff --git a/src/minecraft/biomesoplenty/blocks/BlockIvy.java b/src/minecraft/biomesoplenty/blocks/BlockIvy.java index b70543cd4..584057e48 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockIvy.java +++ b/src/minecraft/biomesoplenty/blocks/BlockIvy.java @@ -6,6 +6,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -379,7 +380,7 @@ public class BlockIvy extends Block implements IShearable } @Override - public boolean isLadder(World world, int x, int y, int z) + public boolean isLadder(World world, int x, int y, int z, EntityLivingBase entity) { return true; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java index 6f245854d..c21c4efad 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java +++ b/src/minecraft/biomesoplenty/blocks/BlockPromisedPortal.java @@ -69,7 +69,7 @@ public class BlockPromisedPortal extends Block return false; } - @Override + /*@Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if (par5Entity.ridingEntity == null && par5Entity.riddenByEntity == null) @@ -87,5 +87,5 @@ public class BlockPromisedPortal extends Block } } } - } + }*/ } diff --git a/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java index aeac2af13..aa06e1ac3 100644 --- a/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java +++ b/src/minecraft/biomesoplenty/blocks/renderers/ItemGraveRenderer.java @@ -1,5 +1,8 @@ package biomesoplenty.blocks.renderers; +import java.io.File; + +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; @@ -70,7 +73,7 @@ public class ItemGraveRenderer implements IItemRenderer //This is setting the initial location. GL11.glTranslatef((float) x + 0.5F, (float) y + 1.80F, (float) z + 0.5F); //This is the texture of your block. It's pathed to be the same place as your other blocks here. - FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/BiomesOPlenty/textures/models/grave.png"); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/mods/BiomesOPlenty/textures/models/grave.png")); //This rotation part is very important! Without it, your model will render upside-down! And for some reason you DO need PushMatrix again! GL11.glPushMatrix(); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java index f22868b9d..62b29ef49 100644 --- a/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java +++ b/src/minecraft/biomesoplenty/blocks/renderers/TileEntityGraveRenderer.java @@ -1,6 +1,7 @@ package biomesoplenty.blocks.renderers; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -41,7 +42,7 @@ public class TileEntityGraveRenderer extends TileEntitySpecialRenderer GL11.glTranslatef((float) x + 0.5F, (float) y + 2.25F, (float) z + 0.5F); //This is the texture of your block. It's pathed to be the same place as your other blocks here. - FMLClientHandler.instance().getClient().renderEngine.bindTexture("/mods/BiomesOPlenty/textures/models/grave.png"); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/mods/BiomesOPlenty/textures/models/grave.png")); //This rotation part is very important! Without it, your model will render upside-down! And for some reason you DO need PushMatrix again! GL11.glPushMatrix(); diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index 55d1204b2..d2a129052 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -157,36 +157,36 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Block.stoneBrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', Blocks.moss.get(), 'S', Block.stoneBrick}); //Scythes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheWood.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheStone.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Block.cobblestone, Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheIron.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.ingotIron, Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheGold.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.ingotGold, Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheDiamond.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.diamond, Character.valueOf('S'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheWood.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), "plankWood", Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheStone.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Block.cobblestone, Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheIron.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.ingotIron, Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheGold.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.ingotGold, Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheDiamond.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Item.diamond, Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); //Mud Tools and Armor - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.swordMud.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.axeMud.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.hoeMud.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.pickaxeMud.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.shovelMud.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.swordMud.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.axeMud.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.hoeMud.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), Items.mudball.get(), Character.valueOf('X'), "stickWood"})); GameRegistry.addRecipe(new ItemStack(Items.helmetMud.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), Items.mudball.get()}); GameRegistry.addRecipe(new ItemStack(Items.chestplateMud.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), Items.mudball.get()}); GameRegistry.addRecipe(new ItemStack(Items.leggingsMud.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), Items.mudball.get()}); GameRegistry.addRecipe(new ItemStack(Items.bootsMud.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), Items.mudball.get()}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheMud.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), Items.mudball.get(), Character.valueOf('S'), "stickWood" })); //Amethyst Tools and Armor - GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.swordAmethyst.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.axeAmethyst.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); - GameRegistry.addRecipe(new ItemStack(Items.hoeAmethyst.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); + //GameRegistry.addRecipe(new ItemStack(Items.pickaxeAmethyst.get(), 1), new Object [] {"###", " X ", " X ", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); + //GameRegistry.addRecipe(new ItemStack(Items.shovelAmethyst.get(), 1), new Object [] {"#", "X", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); + //GameRegistry.addRecipe(new ItemStack(Items.swordAmethyst.get(), 1), new Object [] {"#", "#", "X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); + //GameRegistry.addRecipe(new ItemStack(Items.axeAmethyst.get(), 1), new Object [] {"##", "#X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); + //GameRegistry.addRecipe(new ItemStack(Items.hoeAmethyst.get(), 1), new Object [] {"##", " X", " X", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('X'), Item.ingotIron}); GameRegistry.addRecipe(new ItemStack(Items.helmetAmethyst.get(), 1), new Object [] {"###", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Items.chestplateAmethyst.get(), 1), new Object [] {"# #", "###", "###", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Items.leggingsAmethyst.get(), 1), new Object [] {"###", "# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Items.bootsAmethyst.get(), 1), new Object [] {"# #", "# #", Character.valueOf('#'), new ItemStack(Items.miscItems.get(), 1, 2)}); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), Item.ingotIron})); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.scytheAmethyst.get(), 1), new Object [] {"MMS", "XSX", "SXX", Character.valueOf('M'), new ItemStack(Items.miscItems.get(), 1, 2), Character.valueOf('S'), Item.ingotIron})); //Flower Bands GameRegistry.addRecipe(new ItemStack(Items.flowerBand.get(), 1, 0), new Object [] {"CCC", "C C", "CCC", Character.valueOf('C'), new ItemStack(Blocks.flowers.get(), 1, 0)}); diff --git a/src/minecraft/biomesoplenty/configuration/BOPItems.java b/src/minecraft/biomesoplenty/configuration/BOPItems.java index ac0d16a76..88c620d6b 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPItems.java +++ b/src/minecraft/biomesoplenty/configuration/BOPItems.java @@ -85,16 +85,16 @@ public class BOPItems { { // Material declaration EnumArmorMaterialMud = EnumHelper.addArmorMaterial("MUD", 2, new int[]{1, 1, 1, 1}, 5); - EnumToolMaterialMud = EnumHelper.addToolMaterial("MUD", 0, 32, 0.5F, 0, 1); + //EnumToolMaterialMud = EnumHelper.addToolMaterial("MUD", 0, 32, 0.5F, 0, 1); EnumArmorMaterialAmethyst = EnumHelper.addArmorMaterial("AMETHYST", 40, new int[]{6, 12, 10, 6}, 20); - EnumToolMaterialAmethyst = EnumHelper.addToolMaterial("AMETHYST", 4, 2013, 15.0F, 5, 16); + //EnumToolMaterialAmethyst = EnumHelper.addToolMaterial("AMETHYST", 4, 2013, 15.0F, 5, 16); EnumArmorMaterialFlowerBand = EnumHelper.addArmorMaterial("FLOWERBAND", -1, new int[]{0, 0, 0, 0}, 0); initializeItems(); - MinecraftForge.setToolClass(Items.shovelAmethyst.get(), "shovel", 4); - MinecraftForge.setToolClass(Items.pickaxeAmethyst.get(), "pickaxe", 4); - MinecraftForge.setToolClass(Items.axeAmethyst.get(), "axe", 4); + //MinecraftForge.setToolClass(Items.shovelAmethyst.get(), "shovel", 4); + //MinecraftForge.setToolClass(Items.pickaxeAmethyst.get(), "pickaxe", 4); + //MinecraftForge.setToolClass(Items.axeAmethyst.get(), "axe", 4); } private static void initializeItems() @@ -116,33 +116,33 @@ public class BOPItems { Items.bopDisc = Optional.of(new ItemBOPRecord(BOPConfiguration.bopDiscID, "bopdisc").setUnlocalizedName("bop.bopDisc")); Items.bopDiscMud = Optional.of(new ItemBOPRecordMud(BOPConfiguration.bopDiscMudID, "bopdiscmud").setUnlocalizedName("bop.bopDiscMud")); - Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); - Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); - Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); - Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); - Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); + //Items.swordMud = Optional.of((new ItemBOPSword(BOPConfiguration.swordMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.swordMud")); + //Items.shovelMud = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.shovelMud")); + //Items.pickaxeMud = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.pickaxeMud")); + //Items.axeMud = Optional.of((new ItemBOPAxe(BOPConfiguration.axeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hatchetMud")); + //Items.hoeMud = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeMudID, EnumToolMaterialMud, 0)).setUnlocalizedName("bop.hoeMud")); Items.helmetMud = Optional.of((new ArmorMuddy(BOPConfiguration.helmetMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 0)).setUnlocalizedName("bop.helmetMud")); Items.chestplateMud = Optional.of((new ArmorMuddy(BOPConfiguration.chestplateMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 1)).setUnlocalizedName("bop.chestplateMud")); Items.leggingsMud = Optional.of((new ArmorMuddy(BOPConfiguration.leggingsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 2)).setUnlocalizedName("bop.leggingsMud")); Items.bootsMud = Optional.of((new ArmorMuddy(BOPConfiguration.bootsMudID, EnumArmorMaterialMud, BiomesOPlenty.proxy.addArmor("mud"), 3)).setUnlocalizedName("bop.bootsMud")); - Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); - Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); - Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); - Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); - Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); + //Items.swordAmethyst = Optional.of((new ItemBOPSword(BOPConfiguration.swordAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.swordAmethyst")); + //Items.shovelAmethyst = Optional.of((new ItemBOPSpade(BOPConfiguration.shovelAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.shovelAmethyst")); + //Items.pickaxeAmethyst = Optional.of((new ItemBOPPickaxe(BOPConfiguration.pickaxeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.pickaxeAmethyst")); + //Items.axeAmethyst = Optional.of((new ItemBOPAxe(BOPConfiguration.axeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hatchetAmethyst")); + //Items.hoeAmethyst = Optional.of((new ItemBOPHoe(BOPConfiguration.hoeAmethystID, EnumToolMaterialAmethyst, 1)).setUnlocalizedName("bop.hoeAmethyst")); Items.helmetAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.helmetAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 0)).setUnlocalizedName("bop.helmetAmethyst")); Items.chestplateAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.chestplateAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 1)).setUnlocalizedName("bop.chestplateAmethyst")); Items.leggingsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.leggingsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 2)).setUnlocalizedName("bop.leggingsAmethyst")); Items.bootsAmethyst = Optional.of((new ArmorAmethyst(BOPConfiguration.bootsAmethystID, EnumArmorMaterialAmethyst, BiomesOPlenty.proxy.addArmor("amethyst"), 3)).setUnlocalizedName("bop.bootsAmethyst")); - Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); - Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); - Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); - Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); - Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); - Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); - Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); + //Items.scytheWood = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheWoodID, 2, EnumToolMaterial.WOOD, 0).setUnlocalizedName("bop.scytheWood"))); + //Items.scytheStone = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheStoneID, 2, EnumToolMaterial.STONE, 1).setUnlocalizedName("bop.scytheStone"))); + //Items.scytheIron = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheIronID, 2, EnumToolMaterial.IRON, 2).setUnlocalizedName("bop.scytheIron"))); + //Items.scytheGold = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheGoldID, 2, EnumToolMaterial.GOLD, 3).setUnlocalizedName("bop.scytheGold"))); + //Items.scytheDiamond = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheDiamondID, 2, EnumToolMaterial.EMERALD, 4).setUnlocalizedName("bop.scytheDiamond"))); + //Items.scytheMud = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheMudID, 2, EnumToolMaterialMud, 5).setUnlocalizedName("bop.scytheMud"))); + //Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); } diff --git a/src/minecraft/biomesoplenty/entities/EntityGlob.java b/src/minecraft/biomesoplenty/entities/EntityGlob.java index ff7c3abf6..20c8bfd69 100644 --- a/src/minecraft/biomesoplenty/entities/EntityGlob.java +++ b/src/minecraft/biomesoplenty/entities/EntityGlob.java @@ -1,6 +1,7 @@ package biomesoplenty.entities; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -27,7 +28,6 @@ public class EntityGlob extends EntityLiving implements IMob public EntityGlob(World par1World) { super(par1World); - texture = "/mods/BiomesOPlenty/textures/mobs/glob.png"; int i = 1 << rand.nextInt(3); yOffset = 0.0F; GlobJumpDelay = rand.nextInt(20) + 10; @@ -46,17 +46,11 @@ public class EntityGlob extends EntityLiving implements IMob dataWatcher.updateObject(16, new Byte((byte)par1)); this.setSize(0.6F * par1, 0.6F * par1); this.setPosition(posX, posY, posZ); - this.setEntityHealth(this.getMaxHealth()); + this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a((double)(par1 * par1)); + this.setEntityHealth(this.func_110138_aP()); experienceValue = par1; } - @Override - public int getMaxHealth() - { - int i = this.getGlobSize(); - return i * i; - } - /** * Returns the size of the Glob. */ @@ -211,7 +205,8 @@ public class EntityGlob extends EntityLiving implements IMob { int i = this.getGlobSize(); - if (!worldObj.isRemote && i > 1 && this.getHealth() <= 0) + //func_110143_aJ() == getHealth + if (!worldObj.isRemote && i > 1 && this.func_110143_aJ() <= 0) { int j = 2 + rand.nextInt(3); @@ -305,7 +300,7 @@ public class EntityGlob extends EntityLiving implements IMob { BiomeGenBase biomegenbase = worldObj.getBiomeGenForCoords(MathHelper.floor_double(posX), MathHelper.floor_double(posZ)); - if (biomegenbase == BiomeGenBase.swampland && posY > 50.0D && posY < 70.0D && rand.nextFloat() < 0.5F && rand.nextFloat() < spawnChances[worldObj.getMoonPhase()] && worldObj.getBlockLightValue(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)) <= rand.nextInt(8)) + if (biomegenbase == BiomeGenBase.swampland && posY > 50.0D && posY < 70.0D && rand.nextFloat() < 0.5F && rand.nextFloat() < this.worldObj.getMoonPhase() && worldObj.getBlockLightValue(MathHelper.floor_double(posX), MathHelper.floor_double(posY), MathHelper.floor_double(posZ)) <= rand.nextInt(8)) return super.getCanSpawnHere(); if (rand.nextInt(10) == 0 && chunk.getRandomWithSeed(987234911L).nextInt(10) == 0 && posY < 40.0D) diff --git a/src/minecraft/biomesoplenty/entities/EntityJungleSpider.java b/src/minecraft/biomesoplenty/entities/EntityJungleSpider.java index 9f61c62b6..442efdc47 100644 --- a/src/minecraft/biomesoplenty/entities/EntityJungleSpider.java +++ b/src/minecraft/biomesoplenty/entities/EntityJungleSpider.java @@ -12,25 +12,25 @@ public class EntityJungleSpider extends EntitySpider public EntityJungleSpider(World par1World) { super(par1World); - texture = "/mods/BiomesOPlenty/textures/mobs/junglespider.png"; + //texture = "/mods/BiomesOPlenty/textures/mobs/junglespider.png"; this.setSize(0.4F, 0.3F); - moveSpeed = 1.1F; + //moveSpeed = 1.1F; } - @Override + /*@Override public int getMaxHealth() { return 8; - } + }*/ /** * How large the spider should be scaled. */ - @Override + /*@Override public float spiderScaleAmount() { return 0.4F; - } + }*/ @Override public float getShadowSize() @@ -73,6 +73,6 @@ public class EntityJungleSpider extends EntitySpider /** * Initialize this creature. */ - @Override - public void initCreature() {} + /*@Override + public void initCreature() {}*/ } diff --git a/src/minecraft/biomesoplenty/entities/EntityRosester.java b/src/minecraft/biomesoplenty/entities/EntityRosester.java index 725487dbc..d53596d1b 100644 --- a/src/minecraft/biomesoplenty/entities/EntityRosester.java +++ b/src/minecraft/biomesoplenty/entities/EntityRosester.java @@ -31,7 +31,7 @@ public class EntityRosester extends EntityChicken public EntityRosester(World par1World) { super(par1World); - texture = "/mods/BiomesOPlenty/textures/mobs/rosester.png"; + //this.texture = "/mods/BiomesOPlenty/textures/mobs/rosester.png"; this.setSize(0.3F, 0.7F); timeUntilNextEgg = rand.nextInt(6000) + 6000; float var2 = 0.25F; @@ -54,11 +54,11 @@ public class EntityRosester extends EntityChicken return true; } - @Override + /*@Override public int getMaxHealth() { return 4; - } + }*/ /** * Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons diff --git a/src/minecraft/biomesoplenty/entities/RenderGlob.java b/src/minecraft/biomesoplenty/entities/RenderGlob.java index 240ea60c2..58327d638 100644 --- a/src/minecraft/biomesoplenty/entities/RenderGlob.java +++ b/src/minecraft/biomesoplenty/entities/RenderGlob.java @@ -2,6 +2,8 @@ package biomesoplenty.entities; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.resources.ResourceLocation; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import org.lwjgl.opengl.GL11; @@ -20,9 +22,6 @@ public class RenderGlob extends RenderLiving scaleAmount = par2ModelBase; } - /** - * Determines whether Glob Render should pass or not. - */ protected int shouldGlobRenderPass(EntityGlob par1EntityGlob, int par2, float par3) { if (par1EntityGlob.isInvisible()) @@ -58,22 +57,9 @@ public class RenderGlob extends RenderLiving GL11.glScalef(f3 * f1, 1.0F / f3 * f1, f3 * f1); } - /** - * Allows the render to do any OpenGL state modifications necessary before the model is rendered. Args: - * entityLiving, partialTickTime - */ @Override - protected void preRenderCallback(EntityLiving par1EntityLiving, float par2) + protected ResourceLocation func_110775_a(Entity entity) { - this.scaleGlob((EntityGlob)par1EntityLiving, par2); - } - - /** - * Queries whether should render the specified pass or not. - */ - @Override - protected int shouldRenderPass(EntityLiving par1EntityLiving, int par2, float par3) - { - return this.shouldGlobRenderPass((EntityGlob)par1EntityLiving, par2, par3); + return new ResourceLocation("mods/BiomesOPlenty/textures/mobs/glob.png"); } } \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java index f9c8b8299..207ee9a72 100644 --- a/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java +++ b/src/minecraft/biomesoplenty/handlers/EntityEventHandler.java @@ -1,7 +1,7 @@ package biomesoplenty.handlers; import net.minecraft.block.Block; -import net.minecraft.block.BlockCloth; +import net.minecraft.block.BlockColored; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; @@ -65,7 +65,7 @@ public class EntityEventHandler } } - @ForgeSubscribe + /*@ForgeSubscribe public void canEntitySpawn(CheckSpawn event) { if (event.entityLiving instanceof EntityAnimal) @@ -74,7 +74,7 @@ public class EntityEventHandler int j = MathHelper.floor_double(event.entityLiving.boundingBox.minY); int k = MathHelper.floor_double(event.entityLiving.posZ); - if (event.entityLiving.getMaxSpawnedInChunk() <= event.world.getEntitiesWithinAABB(event.entityLiving.getClass(), AxisAlignedBB.getAABBPool().getAABB(i - 16, j - 4, k - 16, i + 17, j + 5, k + 17)).size()) + if (event.entityLiving. <= event.world.getEntitiesWithinAABB(event.entityLiving.getClass(), AxisAlignedBB.getAABBPool().getAABB(i - 16, j - 4, k - 16, i + 17, j + 5, k + 17)).size()) return; if (event.entityLiving.worldObj.getBlockId(i, j - 1, k) == Blocks.holyGrass.get().blockID && event.entityLiving.worldObj.getFullBlockLightValue(i, j, k) > 8 @@ -83,9 +83,9 @@ public class EntityEventHandler event.setResult(Result.ALLOW); } } - } + }*/ - @ForgeSubscribe + /*@ForgeSubscribe public void fallingFromPromisedLand(LivingHurtEvent event) { if (event.source == DamageSource.outOfWorld && event.entityLiving.dimension == BOPConfiguration.promisedLandDimID) @@ -101,7 +101,7 @@ public class EntityEventHandler } } } - } + }*/ @ForgeSubscribe public void chunkEntered(EntityEvent.EnteringChunk event) @@ -238,7 +238,7 @@ public class EntityEventHandler else if (itemstack.itemID == Items.miscItems.get().itemID && (itemDamage == 5 || itemDamage == 6 || itemDamage == 7 || itemDamage == 8 || itemDamage == 9)) { int dyeMeta = convertToDyeMeta(itemDamage); - int i = BlockCloth.getBlockFromDye(dyeMeta); + int i = BlockColored.getBlockFromDye(dyeMeta); if (entity instanceof EntityWolf) { diff --git a/src/minecraft/biomesoplenty/handlers/MovementHandler.java b/src/minecraft/biomesoplenty/handlers/MovementHandler.java index e6925afbc..25b3a735a 100644 --- a/src/minecraft/biomesoplenty/handlers/MovementHandler.java +++ b/src/minecraft/biomesoplenty/handlers/MovementHandler.java @@ -1,6 +1,7 @@ package biomesoplenty.handlers; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.event.ForgeSubscribe; @@ -12,7 +13,7 @@ public class MovementHandler @ForgeSubscribe public void onEntityLivingUpdate(LivingUpdateEvent event) { - EntityLiving entity = event.entityLiving; + EntityLivingBase entity = event.entityLiving; World world = entity.worldObj; diff --git a/src/minecraft/biomesoplenty/handlers/SoundHandler.java b/src/minecraft/biomesoplenty/handlers/SoundHandler.java index df3121ee1..246ab56ac 100644 --- a/src/minecraft/biomesoplenty/handlers/SoundHandler.java +++ b/src/minecraft/biomesoplenty/handlers/SoundHandler.java @@ -23,7 +23,7 @@ public class SoundHandler { try { - event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile)); + event.manager.soundPoolSounds.addSound(soundFile); } catch (Exception e) @@ -36,7 +36,7 @@ public class SoundHandler { try { - event.manager.soundPoolStreaming.addSound(recordSoundFile, this.getClass().getResource("/" + recordSoundFile)); + event.manager.soundPoolStreaming.addSound(recordSoundFile); } catch (Exception e) diff --git a/src/minecraft/biomesoplenty/handlers/TickHandlerClient.java b/src/minecraft/biomesoplenty/handlers/TickHandlerClient.java index 412e1d41e..ceb760d11 100644 --- a/src/minecraft/biomesoplenty/handlers/TickHandlerClient.java +++ b/src/minecraft/biomesoplenty/handlers/TickHandlerClient.java @@ -27,16 +27,16 @@ public class TickHandlerClient implements ITickHandler if (Version.needsBOPWorldtypeAndMarkAsSeen(player.worldObj)) { - player.sendChatToPlayer(String.format("\u00A7cThe Biomes O Plenty world type must be used in order for the new biomes to generate. This message will only display once.")); + player.addChatMessage(String.format("\u00A7cThe Biomes O Plenty world type must be used in order for the new biomes to generate. This message will only display once.")); } if (Version.needsUpdateNoticeAndMarkAsSeen()) { - player.sendChatToPlayer(String.format("\u00A7cA new version of Biomes O Plenty is available: %s for Minecraft %s", Version.getRecommendedVersion(), Loader.instance().getMinecraftModContainer().getVersion())); + player.addChatMessage(String.format("\u00A7cA new version of Biomes O Plenty is available: %s for Minecraft %s", Version.getRecommendedVersion(), Loader.instance().getMinecraftModContainer().getVersion())); for (String updateLine : Version.getChangelog()) { - player.sendChatToPlayer("\u00A79" + updateLine); + player.addChatMessage("\u00A79" + updateLine); } } diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java index af5b67095..4ef0c7a0d 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPMudball.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPMudball.java @@ -33,7 +33,7 @@ public class ItemBOPMudball extends Item par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if (!par2World.isRemote) { - par2World.spawnEntityInWorld(new EntityMudball(par2World, par3EntityPlayer)); + par2World.spawnEntityInWorld(new EntityMudball(par2World)); } return itemStack; diff --git a/src/minecraft/biomesoplenty/items/ItemBOPScythe.java b/src/minecraft/biomesoplenty/items/ItemBOPScythe.java index 964cd0f86..0ae09d14f 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPScythe.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPScythe.java @@ -5,6 +5,7 @@ import net.minecraft.block.BlockFlower; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumToolMaterial; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -29,12 +30,12 @@ public class ItemBOPScythe extends Item this.maxStackSize = 1; this.setMaxDamage(enumtoolmat.getMaxUses()); textureID = texture; - this.damageVsEntity = damage + enumtoolmat.getDamageVsEntity(); + this.damageVsEntity = (int) (damage + enumtoolmat.getDamageVsEntity()); setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override - public boolean onBlockDestroyed(ItemStack itemstack, World world, int meta, int x, int y, int z, EntityLiving entity) + public boolean onBlockDestroyed(ItemStack itemstack, World world, int meta, int x, int y, int z, EntityLivingBase entity) { Block block = Block.blocksList[world.getBlockId(x, y, z)]; int radius = 1; @@ -111,7 +112,7 @@ public class ItemBOPScythe extends Item } @Override - public int getDamageVsEntity(Entity par1Entity) + public float getDamageVsEntity(Entity par1Entity, ItemStack itemstack) { return this.damageVsEntity; } diff --git a/src/minecraft/biomesoplenty/items/ItemDartBlower.java b/src/minecraft/biomesoplenty/items/ItemDartBlower.java index e330387e6..3326ff26f 100644 --- a/src/minecraft/biomesoplenty/items/ItemDartBlower.java +++ b/src/minecraft/biomesoplenty/items/ItemDartBlower.java @@ -43,7 +43,7 @@ public class ItemDartBlower extends Item if (flag || par3EntityPlayer.inventory.hasItem(Items.dart.get().itemID)) { //EntityArrow entitydart = new EntityArrow(par2World, par3EntityPlayer, 2.0F); - EntityDart entityDart = new EntityDart(par2World, par3EntityPlayer, 1.25F); + EntityDart entityDart = new EntityDart(par2World); itemStack.damageItem(1, par3EntityPlayer); par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 1.0F, 2.0F / (1.0F * 0.4F + 1.2F) + 1.0F * 0.5F); diff --git a/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java b/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java index 1a955dab4..3960f0b7c 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java +++ b/src/minecraft/biomesoplenty/items/projectiles/RenderDart.java @@ -2,6 +2,7 @@ package biomesoplenty.items.projectiles; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; @@ -17,12 +18,6 @@ public class RenderDart extends Render public void renderArrow(EntityDart par1EntityArrow, double par2, double par4, double par6, float par8, float par9) { - if (!par1EntityArrow.isPoisonous()) { - this.loadTexture("/mods/BiomesOPlenty/textures/projectiles/dart.png"); - } else { - this.loadTexture("/mods/BiomesOPlenty/textures/projectiles/poisondart.png"); - } - GL11.glPushMatrix(); GL11.glTranslatef((float)par2, (float)par4, (float)par6); GL11.glRotatef(par1EntityArrow.prevRotationYaw + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); @@ -92,4 +87,17 @@ public class RenderDart extends Render { this.renderArrow((EntityDart)par1Entity, par2, par4, par6, par8, par9); } + + @Override + protected ResourceLocation func_110775_a(Entity entity) + { + if (!((EntityDart)entity).isPoisonous()) + { + return new ResourceLocation("/mods/BiomesOPlenty/textures/projectiles/dart.png"); + } + else + { + return new ResourceLocation("/mods/BiomesOPlenty/textures/projectiles/poisondart.png"); + } + } } \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/items/projectiles/RenderPoisonDart.java b/src/minecraft/biomesoplenty/items/projectiles/RenderPoisonDart.java index a603280db..b33a695a0 100644 --- a/src/minecraft/biomesoplenty/items/projectiles/RenderPoisonDart.java +++ b/src/minecraft/biomesoplenty/items/projectiles/RenderPoisonDart.java @@ -2,6 +2,7 @@ package biomesoplenty.items.projectiles; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.util.MathHelper; @@ -15,10 +16,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderPoisonDart extends Render { - public void renderArrow(EntityArrow par1EntityArrow, double par2, double par4, double par6, float par8, float par9) { - this.loadTexture("/mods/BiomesOPlenty/textures/projectiles/poisondart.png"); GL11.glPushMatrix(); GL11.glTranslatef((float)par2, (float)par4, (float)par6); GL11.glRotatef(par1EntityArrow.prevRotationYaw + (par1EntityArrow.rotationYaw - par1EntityArrow.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); @@ -88,4 +87,10 @@ public class RenderPoisonDart extends Render { this.renderArrow((EntityArrow)par1Entity, par2, par4, par6, par8, par9); } + + @Override + protected ResourceLocation func_110775_a(Entity entity) + { + return new ResourceLocation("/mods/BiomesOPlenty/textures/projectiles/poisondart.png"); + } } \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java b/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java index c2fddf242..39775c3a3 100644 --- a/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java +++ b/src/minecraft/biomesoplenty/particles/EntityDandelionFX.java @@ -2,6 +2,7 @@ package biomesoplenty.particles; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -38,7 +39,7 @@ public class EntityDandelionFX extends EntityFX GL11.glDepthMask(false); GL11.glEnable(3042); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(texture)); float sizeFactor = 0.1F * particleScale; float var13 = (float)(prevPosX + (posX - prevPosX) * par2 - EntityFX.interpPosX); @@ -61,7 +62,7 @@ public class EntityDandelionFX extends EntityFX GL11.glPopMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture("/particles.png"); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/particles.png")); tessellator.startDrawingQuads(); } diff --git a/src/minecraft/biomesoplenty/particles/EntitySteamFX.java b/src/minecraft/biomesoplenty/particles/EntitySteamFX.java index 95008f721..8a15e9563 100644 --- a/src/minecraft/biomesoplenty/particles/EntitySteamFX.java +++ b/src/minecraft/biomesoplenty/particles/EntitySteamFX.java @@ -2,6 +2,7 @@ package biomesoplenty.particles; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -58,7 +59,7 @@ public class EntitySteamFX extends EntityFX GL11.glEnable(3042); GL11.glBlendFunc(770, 1); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(texture)); float sizeFactor = 0.1F * particleScale; float var13 = (float)(prevPosX + (posX - prevPosX) * par2 - EntityFX.interpPosX); @@ -81,7 +82,7 @@ public class EntitySteamFX extends EntityFX GL11.glPopMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture("/particles.png"); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/particles.png")); tessellator.startDrawingQuads(); } diff --git a/src/minecraft/biomesoplenty/potions/PotionNourishment.java b/src/minecraft/biomesoplenty/potions/PotionNourishment.java index 6872d073c..86be6821e 100644 --- a/src/minecraft/biomesoplenty/potions/PotionNourishment.java +++ b/src/minecraft/biomesoplenty/potions/PotionNourishment.java @@ -1,6 +1,7 @@ package biomesoplenty.potions; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.potion.Potion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +18,7 @@ public class PotionNourishment extends Potion @SideOnly(Side.CLIENT) public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png"); + Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png")); return 0; } diff --git a/src/minecraft/biomesoplenty/potions/PotionParalysis.java b/src/minecraft/biomesoplenty/potions/PotionParalysis.java index e9cc2a457..a719f9b8d 100644 --- a/src/minecraft/biomesoplenty/potions/PotionParalysis.java +++ b/src/minecraft/biomesoplenty/potions/PotionParalysis.java @@ -1,6 +1,7 @@ package biomesoplenty.potions; import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.potion.Potion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +18,7 @@ public class PotionParalysis extends Potion @SideOnly(Side.CLIENT) public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png"); + Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("/mods/BiomesOPlenty/textures/potions/BOPPotionFX.png")); return 1; } diff --git a/src/minecraft/biomesoplenty/worldgen/structure/BOPStructureVillageStart.java b/src/minecraft/biomesoplenty/worldgen/structure/BOPStructureVillageStart.java index 5509ace22..378dd6212 100644 --- a/src/minecraft/biomesoplenty/worldgen/structure/BOPStructureVillageStart.java +++ b/src/minecraft/biomesoplenty/worldgen/structure/BOPStructureVillageStart.java @@ -2,6 +2,7 @@ package biomesoplenty.worldgen.structure; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import java.util.Random; import net.minecraft.world.World; @@ -18,31 +19,31 @@ class BOPStructureVillageStart extends StructureStart public BOPStructureVillageStart(World par1World, Random par2Random, int par3, int par4, int par5) { - ArrayList arraylist = StructureVillagePieces.getStructureVillageWeightedPieceList(par2Random, par5); - ComponentVillageStartPiece componentvillagestartpiece = new ComponentVillageStartPiece(par1World.getWorldChunkManager(), 0, par2Random, (par3 << 4) + 2, (par4 << 4) + 2, arraylist, par5); + List list = StructureVillagePieces.getStructureVillageWeightedPieceList(par2Random, par5); + ComponentVillageStartPiece componentvillagestartpiece = new ComponentVillageStartPiece(par1World.getWorldChunkManager(), 0, par2Random, (par3 << 4) + 2, (par4 << 4) + 2, list, par5); components.add(componentvillagestartpiece); componentvillagestartpiece.buildComponent(componentvillagestartpiece, components, par2Random); - ArrayList arraylist1 = componentvillagestartpiece.field_74930_j; - ArrayList arraylist2 = componentvillagestartpiece.field_74932_i; + List list1 = componentvillagestartpiece.field_74930_j; + List list2 = componentvillagestartpiece.field_74932_i; int l; - while (!arraylist1.isEmpty() || !arraylist2.isEmpty()) - { - StructureComponent structurecomponent; + while (!list1.isEmpty() || !list2.isEmpty()) + { + StructureComponent structurecomponent; - if (arraylist1.isEmpty()) - { - l = par2Random.nextInt(arraylist2.size()); - structurecomponent = (StructureComponent)arraylist2.remove(l); - structurecomponent.buildComponent(componentvillagestartpiece, components, par2Random); - } - else - { - l = par2Random.nextInt(arraylist1.size()); - structurecomponent = (StructureComponent)arraylist1.remove(l); - structurecomponent.buildComponent(componentvillagestartpiece, components, par2Random); - } - } + if (list1.isEmpty()) + { + l = par2Random.nextInt(list2.size()); + structurecomponent = (StructureComponent)list2.remove(l); + structurecomponent.buildComponent(componentvillagestartpiece, this.components, par2Random); + } + else + { + l = par2Random.nextInt(list1.size()); + structurecomponent = (StructureComponent)list1.remove(l); + structurecomponent.buildComponent(componentvillagestartpiece, this.components, par2Random); + } + } this.updateBoundingBox(); l = 0; diff --git a/src/minecraft/mods/tinker/tconstruct/library/blocks/InventoryBlock.java b/src/minecraft/mods/tinker/tconstruct/library/blocks/InventoryBlock.java index 0319ef6a9..b152f176c 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/blocks/InventoryBlock.java +++ b/src/minecraft/mods/tinker/tconstruct/library/blocks/InventoryBlock.java @@ -8,6 +8,7 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -108,7 +109,7 @@ public abstract class InventoryBlock extends BlockContainer /* Placement */ @Override - public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving entityliving, ItemStack stack) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack stack) { TileEntity logic = world.getBlockTileEntity(x, y, z); if (logic instanceof IFacingLogic) @@ -120,7 +121,7 @@ public abstract class InventoryBlock extends BlockContainer } else { - direction.setDirection(entityliving.rotationYaw * 4F, entityliving.rotationPitch, entityliving); + direction.setDirection(entityliving.rotationYaw * 4F, entityliving.rotationPitch, (EntityLiving)entityliving); } } } diff --git a/src/minecraft/mods/tinker/tconstruct/library/crafting/ToolBuilder.java b/src/minecraft/mods/tinker/tconstruct/library/crafting/ToolBuilder.java index 1878daf06..4be0bdb20 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/crafting/ToolBuilder.java +++ b/src/minecraft/mods/tinker/tconstruct/library/crafting/ToolBuilder.java @@ -237,7 +237,7 @@ public class ToolBuilder } durability = (int) (durability / heads * (0.5 + heads * 0.5) * modifier * item.getDurabilityModifier()); - attack = attack / heads + item.getDamageVsEntity(null); + attack = (int) (attack / heads + item.getDamageVsEntity(null, extraStack)); if (attack % heads != 0) attack++; diff --git a/src/minecraft/mods/tinker/tconstruct/library/tools/AbilityHelper.java b/src/minecraft/mods/tinker/tconstruct/library/tools/AbilityHelper.java index 13512e1b6..7c022369f 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/tools/AbilityHelper.java +++ b/src/minecraft/mods/tinker/tconstruct/library/tools/AbilityHelper.java @@ -94,7 +94,7 @@ public class AbilityHelper float knockback = 0; int enchantDamage = 0; - if (entity instanceof EntityLiving) + /*if (entity instanceof EntityLiving) { enchantDamage = EnchantmentHelper.getEnchantmentModifierLiving(player, (EntityLiving) entity); knockback += EnchantmentHelper.getKnockbackModifier(player, (EntityLiving) entity); @@ -113,7 +113,7 @@ public class AbilityHelper knockback += lunge - 1.0f; damage *= lunge; } - } + }*/ float modKnockback = 0f; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) @@ -156,7 +156,7 @@ public class AbilityHelper if (broken) damage = 1; - boolean causedDamage = false; + /*boolean causedDamage = false; if (tool.pierceArmor() && !broken) causedDamage = entity.attackEntityFrom(causePlayerPiercingDamage(player), damage); else @@ -200,9 +200,9 @@ public class AbilityHelper { EnchantmentThorns.func_92096_a(player, (EntityLiving) entity, random); } - } + }*/ - if (entity instanceof EntityLiving) + /*if (entity instanceof EntityLiving) { stack.hitEntity((EntityLiving) entity, player); if (entity.isEntityAlive()) @@ -233,7 +233,7 @@ public class AbilityHelper player.addExhaustion(0.3F); if (causedDamage) - return true; + return true;*/ } } } @@ -254,7 +254,7 @@ public class AbilityHelper } } - if (!(living instanceof EntityPlayer) || player.func_96122_a((EntityPlayer) living)) + /*if (!(living instanceof EntityPlayer) || player.func_96122_a((EntityPlayer) living)) { List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class, AxisAlignedBB.getAABBPool().getAABB(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D)); @@ -270,7 +270,7 @@ public class AbilityHelper var5.setTarget(living); } } - } + }*/ } } @@ -289,8 +289,8 @@ public class AbilityHelper public static void damageTool (ItemStack stack, int dam, NBTTagCompound tags, EntityLiving entity, boolean ignoreCharge) { - if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode || tags == null) - return; + /*if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode || tags == null) + return;*/ if (ignoreCharge) { @@ -376,11 +376,11 @@ public class AbilityHelper return false; } - if (event.getResult() == Result.ALLOW) + /*if (event.getResult() == Result.ALLOW) { onBlockChanged(stack, world, 0, x, y, z, player, random); return true; - } + }*/ int bID = world.getBlockId(x, y, z); int bIDabove = world.getBlockId(x, y + 1, z); @@ -399,14 +399,15 @@ public class AbilityHelper { return true; } - else + /*else { world.setBlock(x, y, z, block.blockID); onBlockChanged(stack, world, 0, x, y, z, player, random); return true; - } + }*/ } } + return false; } public static void spawnItemAtPlayer (EntityPlayer player, ItemStack stack) diff --git a/src/minecraft/mods/tinker/tconstruct/library/tools/DualHarvestTool.java b/src/minecraft/mods/tinker/tconstruct/library/tools/DualHarvestTool.java index 7419dd0ba..3ee72ce2e 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/tools/DualHarvestTool.java +++ b/src/minecraft/mods/tinker/tconstruct/library/tools/DualHarvestTool.java @@ -41,11 +41,11 @@ public abstract class DualHarvestTool extends HarvestTool if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2")) { boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + /*for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { if (mod.beforeBlockBreak(this, stack, x, y, z, player)) cancelHarvest = true; - } + }*/ return cancelHarvest; } diff --git a/src/minecraft/mods/tinker/tconstruct/library/tools/HarvestTool.java b/src/minecraft/mods/tinker/tconstruct/library/tools/HarvestTool.java index 2cefca49e..f1266bbcf 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/tools/HarvestTool.java +++ b/src/minecraft/mods/tinker/tconstruct/library/tools/HarvestTool.java @@ -34,11 +34,11 @@ public abstract class HarvestTool extends ToolCore if (hlvl <= tags.getInteger("HarvestLevel")) { boolean cancelHarvest = false; - for (ActiveToolMod mod : TConstructRegistry.activeModifiers) + /*for (ActiveToolMod mod : TConstructRegistry.activeModifiers) { if (mod.beforeBlockBreak(this, stack, x, y, z, player)) cancelHarvest = true; - } + }*/ return cancelHarvest; } else diff --git a/src/minecraft/mods/tinker/tconstruct/library/tools/ToolCore.java b/src/minecraft/mods/tinker/tconstruct/library/tools/ToolCore.java index 77898d4b5..46a092587 100755 --- a/src/minecraft/mods/tinker/tconstruct/library/tools/ToolCore.java +++ b/src/minecraft/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -542,7 +542,7 @@ public abstract class ToolCore extends Item public abstract String[] toolCategories (); //Mining - @Override + /*@Override public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player) { boolean cancelHarvest = false; @@ -559,7 +559,7 @@ public abstract class ToolCore extends Item public boolean onBlockDestroyed (ItemStack itemstack, World world, int blockID, int x, int y, int z, EntityLiving player) { return AbilityHelper.onBlockChanged(itemstack, world, blockID, x, y, z, player, random); - } + }*/ @Override public float getStrVsBlock (ItemStack stack, Block block, int meta) @@ -578,7 +578,7 @@ public abstract class ToolCore extends Item return true; } - @Override + /*@Override public boolean hitEntity (ItemStack stack, EntityLiving mob, EntityLiving player) { return true; @@ -598,7 +598,7 @@ public abstract class ToolCore extends Item public int getDamageVsEntity (Entity par1Entity) { return this.damageVsEntity; - } + }*/ //Changes how much durability the base tool has public float getDurabilityModifier () @@ -722,7 +722,7 @@ public abstract class ToolCore extends Item } /* Proper stack damage */ - @Override + /* @Override public int getItemDamageFromStack (ItemStack stack) { NBTTagCompound tags = stack.getTagCompound(); @@ -764,6 +764,6 @@ public abstract class ToolCore extends Item return 0; } return tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); - } + }*/ }