diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerred.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerred.png new file mode 100644 index 000000000..5adf240cb Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerred.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerstem.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerstem.png new file mode 100644 index 000000000..e30a40dc7 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigflowerstem.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigfloweryellow.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigfloweryellow.png new file mode 100644 index 000000000..5adf240cb Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/bigfloweryellow.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/cactus.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/cactus.png new file mode 100644 index 000000000..4ce1e264b Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/cactus.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadbloom.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadbloom.png new file mode 100644 index 000000000..c83b7ce1e Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadbloom.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadgrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadgrass.png new file mode 100644 index 000000000..86d64d5a8 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadgrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves1.png new file mode 100644 index 000000000..5c57a4e6a Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves2.png new file mode 100644 index 000000000..689efeeaf Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadlog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadlog.png new file mode 100644 index 000000000..40d9b34cc Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/deadlog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/desertsprouts.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/desertsprouts.png new file mode 100644 index 000000000..ab3775edb Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/desertsprouts.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/drieddirt.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/drieddirt.png new file mode 100644 index 000000000..250b4c742 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/drieddirt.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/dunegrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/dunegrass.png new file mode 100644 index 000000000..880564b7e Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/dunegrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves1.png new file mode 100644 index 000000000..265fdd3c3 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves2.png new file mode 100644 index 000000000..fe318f7d4 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/firlog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firlog.png new file mode 100644 index 000000000..97eda2457 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firlog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/firplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firplank.png new file mode 100644 index 000000000..b4b19c59b Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/firsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firsappling.png new file mode 100644 index 000000000..3a900b161 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/firsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/glowflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/glowflower.png new file mode 100644 index 000000000..0209ab085 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/glowflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/harddirt.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/harddirt.png new file mode 100644 index 000000000..72f9d4173 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/harddirt.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardice.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardice.png new file mode 100644 index 000000000..3ee1a9053 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardice.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardsand.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardsand.png new file mode 100644 index 000000000..adfe20302 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hardsand.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrassbottom.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrassbottom.png new file mode 100644 index 000000000..5011d1373 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrassbottom.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrasstop.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrasstop.png new file mode 100644 index 000000000..9dcc838a3 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/highgrasstop.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass1.png new file mode 100644 index 000000000..7693e9240 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass2.png new file mode 100644 index 000000000..87ca6ffac Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holygrass2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves1.png new file mode 100644 index 000000000..0db0e085d Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves2.png new file mode 100644 index 000000000..dd53027df Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holylog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holylog.png new file mode 100644 index 000000000..9ecb62689 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holylog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyplank.png new file mode 100644 index 000000000..d8b9b818d Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holyplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysappling.png new file mode 100644 index 000000000..57918c583 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png new file mode 100644 index 000000000..73ea9d89a Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holytallgrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holytallgrass.png new file mode 100644 index 000000000..d055c2668 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holytallgrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/hydrangea.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hydrangea.png new file mode 100644 index 000000000..7a4b1e9f0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/hydrangea.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/magiclog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magiclog.png new file mode 100644 index 000000000..612a37a97 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magiclog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicplank.png new file mode 100644 index 000000000..e277f7664 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicsappling.png new file mode 100644 index 000000000..699e58c9b Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/magicsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves1.png new file mode 100644 index 000000000..ffdfe9208 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves2.png new file mode 100644 index 000000000..5aaaccd23 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovelog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovelog.png new file mode 100644 index 000000000..dbd6df74c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovelog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveplank.png new file mode 100644 index 000000000..959f52686 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangroveplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovesappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovesappling.png new file mode 100644 index 000000000..52b89f735 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mangrovesappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mediumgrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mediumgrass.png new file mode 100644 index 000000000..2b93087a6 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mediumgrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/moss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/moss.png new file mode 100644 index 000000000..86ad9f8de Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/moss.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mud.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mud.png new file mode 100644 index 000000000..fd2011fc6 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mud.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/mudbrick.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mudbrick.png new file mode 100644 index 000000000..04f70770e Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/mudbrick.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeflower.png new file mode 100644 index 000000000..94f28d246 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves1.png new file mode 100644 index 000000000..77cb3f13a Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves2.png new file mode 100644 index 000000000..2de303cdd Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangeleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangesappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangesappling.png new file mode 100644 index 000000000..97508348a Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/orangesappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass1.png new file mode 100644 index 000000000..0e0a6bbf1 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass2.png new file mode 100644 index 000000000..ff32f30e4 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass3.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass3.png new file mode 100644 index 000000000..504a6c671 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/origingrass3.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves1.png new file mode 100644 index 000000000..e85b98708 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves2.png new file mode 100644 index 000000000..13a33204f Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/originsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originsappling.png new file mode 100644 index 000000000..28df09475 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/originsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves1.png new file mode 100644 index 000000000..7da08a2e8 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves2.png new file mode 100644 index 000000000..f37d28cff Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmlog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmlog.png new file mode 100644 index 000000000..50c804b2d Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmlog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmplank.png new file mode 100644 index 000000000..9fcbdd452 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmsappling.png new file mode 100644 index 000000000..a3727a41c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/palmsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkflower.png new file mode 100644 index 000000000..4403c18d0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves1.png new file mode 100644 index 000000000..07750181e Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves2.png new file mode 100644 index 000000000..10bbf528c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinkleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinksappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinksappling.png new file mode 100644 index 000000000..90b2d5d95 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/pinksappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/portal.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/portal.png new file mode 100644 index 000000000..e615420e5 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/portal.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/purpleflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/purpleflower.png new file mode 100644 index 000000000..1141af3d9 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/purpleflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png new file mode 100644 index 000000000..3bfaadf64 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/quicksand.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redbrick.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redbrick.png new file mode 100644 index 000000000..e8482f772 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redbrick.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redcobble.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redcobble.png new file mode 100644 index 000000000..f355448fc Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redcobble.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves1.png new file mode 100644 index 000000000..be1776c66 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves2.png new file mode 100644 index 000000000..84ca178e8 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redrock.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redrock.png new file mode 100644 index 000000000..18e99b5d0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redrock.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redsappling.png new file mode 100644 index 000000000..b290027bf Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves1.png new file mode 100644 index 000000000..34892b301 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves2.png new file mode 100644 index 000000000..c42d197e2 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodlog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodlog.png new file mode 100644 index 000000000..19ea81aef Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodlog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodplank.png new file mode 100644 index 000000000..c46e1c155 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodsappling.png new file mode 100644 index 000000000..339774141 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/redwoodsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/shortgrass.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/shortgrass.png new file mode 100644 index 000000000..a9054de6c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/shortgrass.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass1.png new file mode 100644 index 000000000..15f8a1607 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass3.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass3.png new file mode 100644 index 000000000..358414200 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/smolderinggrass3.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sprout.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sprout.png new file mode 100644 index 000000000..b9f6359f6 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sprout.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/thorn.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/thorn.png new file mode 100644 index 000000000..8b7653f97 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/thorn.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/tinyflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/tinyflower.png new file mode 100644 index 000000000..19d839345 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/tinyflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/toadstool.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/toadstool.png new file mode 100644 index 000000000..d35f2d131 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/toadstool.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/treemoss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/treemoss.png new file mode 100644 index 000000000..c1c100d16 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/treemoss.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/violet.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/violet.png new file mode 100644 index 000000000..f6380beca Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/violet.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteflower.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteflower.png new file mode 100644 index 000000000..93c84a077 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteflower.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves1.png new file mode 100644 index 000000000..e30868a81 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves2.png new file mode 100644 index 000000000..b310a091c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whiteleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/whitesappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whitesappling.png new file mode 100644 index 000000000..6b6a84546 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/whitesappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willow.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willow.png new file mode 100644 index 000000000..19df3c12d Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willow.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves1.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves1.png new file mode 100644 index 000000000..7bfc00860 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves1.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves2.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves2.png new file mode 100644 index 000000000..8443041e7 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves2.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves3.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves3.png new file mode 100644 index 000000000..885f4082c Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves3.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves4.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves4.png new file mode 100644 index 000000000..c92e2e191 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowleaves4.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowlog.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowlog.png new file mode 100644 index 000000000..9ef2ad823 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowlog.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowplank.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowplank.png new file mode 100644 index 000000000..ba7d336f0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowplank.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowsappling.png new file mode 100644 index 000000000..8e5ffadf0 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/willowsappling.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/yellowsappling.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/yellowsappling.png new file mode 100644 index 000000000..c53598c48 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/yellowsappling.png differ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java index 483a1b1a3..647e35c99 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaLog.java @@ -83,7 +83,7 @@ public class BlockAcaciaLog extends Block if ((var13 & 8) == 0) { - par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSapling.java index 475b7701a..dd1f09fe7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockAcaciaSapling.java @@ -29,7 +29,7 @@ public class BlockAcaciaSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"acacia"}; - public BlockAcaciaSapling(int par1, int par2) + public BlockAcaciaSapling(int par1) { super(par1); float var3 = 0.4F; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java index f4e10c763..17dd3080c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockBambooLeaves.java @@ -67,7 +67,7 @@ public class BlockBambooLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.bambooLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -179,7 +179,7 @@ public class BlockBambooLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlock(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java index f2b1e87ab..c69f5b693 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockCherryLog.java @@ -83,7 +83,7 @@ public class BlockCherryLog extends Block if ((var13 & 8) == 0) { - par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java index f614111d0..b0d1932ac 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDarkLog.java @@ -83,7 +83,7 @@ public class BlockDarkLog extends Block if ((var13 & 8) == 0) { - par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java index e485fe52f..629d60798 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadGrass.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -16,7 +17,7 @@ import net.minecraft.world.World; public class BlockDeadGrass extends Block { - protected BlockDeadGrass(int par1, int par2, Material par3Material) + protected BlockDeadGrass(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -25,10 +26,16 @@ public class BlockDeadGrass extends Block this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:deadgrass"); + } - public BlockDeadGrass(int par1, int par2) + public BlockDeadGrass(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -71,7 +78,7 @@ public class BlockDeadGrass extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java index c32cc5257..c2ef8003c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLeaves.java @@ -17,7 +17,7 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockBrownLeaves extends BlockLeavesBase +public class BlockDeadLeaves extends BlockLeavesBase { /** * The base index in terrain.png corresponding to the fancy version of the leaf texture. This is stored so we can @@ -27,13 +27,19 @@ public class BlockBrownLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"dead"}; int[] adjacentTreeBlocks; - public BlockBrownLeaves(int par1) + public BlockDeadLeaves(int par1) { super(par1, Material.leaves, false); this.setBurnProperties(this.blockID, 30, 60); this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves2") : par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves1")); + } /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate @@ -194,7 +200,7 @@ public class BlockBrownLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockAndMetadataWithNotify(par2, par3, par4, this.blockID, 0, 2); + par1World.setBlock(par2, par3, par4, this.blockID); } /** @@ -271,12 +277,6 @@ public class BlockBrownLeaves extends BlockLeavesBase //return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); //} - @Override - public void func_94332_a(IconRegister par1IconRegister) - { - this.field_94336_cN = (isOpaqueCube() ? par1IconRegister.func_94245_a("BiomesOPlenty:deadLeavesOpaque") : par1IconRegister.func_94245_a("BiomesOPlenty:deadLeaves")); - } - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return true; diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java index 13e959380..b08b80bd7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeadLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -16,14 +17,21 @@ public class BlockDeadLog extends Block /** The type of tree this log came from. */ public static final String[] woodType = new String[] {"dead"}; + //=================================== + public BlockDeadLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 39; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:deadlog"); + } + /** * The type of render function that is called for this block */ @@ -72,7 +80,7 @@ public class BlockDeadLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +117,12 @@ public class BlockDeadLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 39))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeathbloom.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeathbloom.java index 10436e953..1f4579ad9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeathbloom.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDeathbloom.java @@ -6,13 +6,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockDeathbloom extends Block { - protected BlockDeathbloom(int par1, int par2, Material par3Material) + protected BlockDeathbloom(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -21,9 +22,15 @@ public class BlockDeathbloom extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockDeathbloom(int par1, int par2) + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:deadbloom"); + } + + public BlockDeathbloom(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -66,7 +73,7 @@ public class BlockDeathbloom extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java index 1d438c1f7..8000bb3c0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertGrass.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; public class BlockDesertGrass extends Block { - protected BlockDesertGrass(int par1, int par2, Material par3Material) + protected BlockDesertGrass(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -26,9 +26,9 @@ public class BlockDesertGrass extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockDesertGrass(int par1, int par2) + public BlockDesertGrass(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -71,7 +71,7 @@ public class BlockDesertGrass extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertSprouts.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertSprouts.java index 2c44d7803..2a4c40db0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertSprouts.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDesertSprouts.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockDesertSprouts extends Block { - protected BlockDesertSprouts(int par1, int par2, Material par3Material) + protected BlockDesertSprouts(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,9 +21,15 @@ public class BlockDesertSprouts extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockDesertSprouts(int par1, int par2) + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:desertsprouts"); + } + + public BlockDesertSprouts(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -65,7 +72,7 @@ public class BlockDesertSprouts extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDriedDirt.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDriedDirt.java index f2d116796..5d1dd6ccc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDriedDirt.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDriedDirt.java @@ -5,17 +5,24 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.World; public class BlockDriedDirt extends Block { - public BlockDriedDirt(int par1, int par2) + public BlockDriedDirt(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:drieddirt"); + } + /** * Returns the ID of the items to drop on destruction. */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDuneGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDuneGrass.java index 591b01e67..b40e7a185 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDuneGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockDuneGrass.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockDuneGrass extends Block { - protected BlockDuneGrass(int par1, int par2, Material par3Material) + protected BlockDuneGrass(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -21,11 +22,17 @@ public class BlockDuneGrass extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockDuneGrass(int par1, int par2) + public BlockDuneGrass(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:dunegrass"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @@ -66,7 +73,7 @@ public class BlockDuneGrass extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java index 7448e31dd..580f218a3 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,15 +26,20 @@ public class BlockFirLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"fir"}; int[] adjacentTreeBlocks; - public BlockFirLeaves(int par1, int par2) + public BlockFirLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setBurnProperties(this.blockID, 30, 60); this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:firleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:firleaves1")); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -55,7 +61,7 @@ public class BlockFirLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.firLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockFirLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockFirLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -266,10 +272,10 @@ public class BlockFirLeaves extends BlockLeavesBase } @Override - public int getBlockTextureFromSideAndMetadata(int side, int metadata) { - - return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + //public int getBlockTextureFromSideAndMetadata(int side, int metadata) { + // + // return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); + //} public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java index fba33e1b7..1ea6af067 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirLog.java @@ -6,11 +6,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +//======================================= + public class BlockFirLog extends Block { /** The type of tree this log came from. */ @@ -19,10 +22,15 @@ public class BlockFirLog extends Block public BlockFirLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 46; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:firlog"); + } /** * The type of render function that is called for this block @@ -72,7 +80,7 @@ public class BlockFirLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +117,12 @@ public class BlockFirLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /* public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 46))))); - } + } */ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirPlank.java index 5296f6d92..84e7b6eff 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,11 +15,17 @@ public class BlockFirPlank extends Block public BlockFirPlank(int par1) { - super(par1, 47, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:firplank"); + } + /** * Determines the damage on the item the block drops. Used in cloth and wood. */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSapling.java index 56cba57d8..a76ae871c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,21 @@ public class BlockFirSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"fir"}; - public BlockFirSapling(int par1, int par2) + //======================================== + + public BlockFirSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); - } + } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:firsappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +54,7 @@ public class BlockFirSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +67,11 @@ public class BlockFirSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -114,14 +123,14 @@ public class BlockFirSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java index a3df40bfb..c6b48f541 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirSlab.java @@ -7,11 +7,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +//============================================== + public class BlockFirSlab extends BlockHalfSlab { /** The type of tree this slab came from. */ @@ -25,10 +28,17 @@ public class BlockFirSlab extends BlockHalfSlab this.useNeighborBrightness[blockID] = true; } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:firplank"); + } + + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +54,15 @@ public class BlockFirSlab extends BlockHalfSlab default: return 47; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +91,7 @@ public class BlockFirSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirStairs.java index 72a4716d6..c245953c8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockFirStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,19 @@ public class BlockFirStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockFirStairs(int par1, Block par2Block, int par3) + public BlockFirStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setBurnProperties(this.blockID, 5, 20); this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:firplank"); + } + } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java index d15782ff1..a74146600 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerRed.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,15 +27,20 @@ public class BlockGiantFlowerRed extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"giantred"}; int[] adjacentTreeBlocks; - public BlockGiantFlowerRed(int par1, int par2) + public BlockGiantFlowerRed(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:bigflowerred"); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -56,7 +62,7 @@ public class BlockGiantFlowerRed extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.giantFlowerRed.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -168,7 +174,7 @@ public class BlockGiantFlowerRed extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -195,7 +201,7 @@ public class BlockGiantFlowerRed extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java index b77a1b91c..5bb175981 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerStem.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -16,14 +17,21 @@ public class BlockGiantFlowerStem extends Block /** The type of tree this log came from. */ public static final String[] woodType = new String[] {"giantstem"}; + //=========================================== + public BlockGiantFlowerStem(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 48; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:bigflowerstem"); + } + /** * The type of render function that is called for this block */ @@ -72,7 +80,7 @@ public class BlockGiantFlowerStem extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +117,12 @@ public class BlockGiantFlowerStem extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 254 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 254 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 254 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 48))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java index 605bb1e60..5fc42b077 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGiantFlowerYellow.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,14 +27,19 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"giantyellow"}; int[] adjacentTreeBlocks; - public BlockGiantFlowerYellow(int par1, int par2) + public BlockGiantFlowerYellow(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:bigfloweryellow"); + } /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate @@ -56,7 +62,7 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.giantFlowerYellow.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -168,7 +174,7 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -195,7 +201,7 @@ public class BlockGiantFlowerYellow extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java index 9f7f3b714..070c67d7c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockGlowFlower.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockGlowFlower extends Block { - protected BlockGlowFlower(int par1, int par2, Material par3Material) + protected BlockGlowFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -19,10 +20,16 @@ public class BlockGlowFlower extends Block this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - - public BlockGlowFlower(int par1, int par2) + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:glowflower"); + } + + public BlockGlowFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -65,7 +72,7 @@ public class BlockGlowFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardDirt.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardDirt.java index 7d5ede120..2171a183d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardDirt.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardDirt.java @@ -6,14 +6,21 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockHardDirt extends Block { - public BlockHardDirt(int par1, int par2) + public BlockHardDirt(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:harddirt"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardIce.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardIce.java index ec81fb75a..049a47a18 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardIce.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardIce.java @@ -4,13 +4,20 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; public class BlockHardIce extends Block { - public BlockHardIce(int par1, int par2) + public BlockHardIce(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:hardice"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardSand.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardSand.java index ca6a5f5a2..bd5f5871f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardSand.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHardSand.java @@ -6,14 +6,21 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockHardSand extends Block { - public BlockHardSand(int par1, int par2) + public BlockHardSand(int par1) { - super(par1, par2, Material.sand); + super(par1, Material.sand); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:hardsand"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassBottom.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassBottom.java index f025c88d5..7bbc8e844 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassBottom.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassBottom.java @@ -5,6 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -20,6 +21,12 @@ public class BlockHighGrassBottom extends BlockFlower this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:highgrassbottom"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java index a9df8cdf8..49ec62bae 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHighGrassTop.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -19,6 +20,12 @@ public class BlockHighGrassTop extends BlockFlower this.setBurnProperties(this.blockID, 60, 100); this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:highgrasstop"); + } /** * Gets passed in the blockID of the block below and supposed to return true if its allowed to grow on the type of diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java index 0c139d723..b154090ff 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyGrass.java @@ -6,32 +6,40 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +//========================================= + public class BlockHolyGrass extends Block { public BlockHolyGrass(int par1) { super(par1, Material.grass); - this.blockIndexInTexture = 28; this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holygrass1"); + } + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { return par1 == 1 ? 29 : (par1 == 0 ? 27 : 28); - } + }*/ /** * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side */ - public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + /*public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 1) { @@ -46,7 +54,7 @@ public class BlockHolyGrass extends Block Material var6 = par1IBlockAccess.getBlockMaterial(par2, par3 + 1, par4); return var6 != Material.snow && var6 != Material.craftedSnow ? 28 : 28; } - } + }*/ /** * Ticks the block if it's been scheduled @@ -57,7 +65,7 @@ public class BlockHolyGrass extends Block { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && Block.lightOpacity[par1World.getBlockId(par2, par3 + 1, par4)] > 2) { - par1World.setBlockWithNotify(par2, par3, par4, mod_BiomesOPlenty.holyStone.blockID); + par1World.setBlock(par2, par3, par4, mod_BiomesOPlenty.holyStone.blockID); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -70,7 +78,7 @@ public class BlockHolyGrass extends Block if (par1World.getBlockId(var7, var8, var9) == mod_BiomesOPlenty.holyStone.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2) { - par1World.setBlockWithNotify(var7, var8, var9, mod_BiomesOPlenty.holyGrass.blockID); + par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.holyGrass.blockID); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java index f5e5debbb..503feff55 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,15 +27,19 @@ public class BlockHolyLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"holy"}; int[] adjacentTreeBlocks; - public BlockHolyLeaves(int par1, int par2) + public BlockHolyLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:holyleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:holyleaves1")); + } /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -56,7 +61,7 @@ public class BlockHolyLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.holyLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -168,7 +173,7 @@ public class BlockHolyLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -195,7 +200,7 @@ public class BlockHolyLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -266,11 +271,11 @@ public class BlockHolyLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java index a605519ef..1e0b912ad 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,10 +20,15 @@ public class BlockHolyLog extends Block public BlockHolyLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 128; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holylog"); + } /** * The type of render function that is called for this block @@ -72,7 +78,7 @@ public class BlockHolyLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlock(par2 + var9, par3 + var10, par4 + var11, var13 | 8); } } } @@ -109,12 +115,12 @@ public class BlockHolyLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 128))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyPlank.java index 26459f330..09518770f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,10 +15,16 @@ public class BlockHolyPlank extends Block public BlockHolyPlank(int par1) { - super(par1, 129, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holyplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java index 8953e650a..22a8551c9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,20 @@ public class BlockHolySapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"holy"}; - public BlockHolySapling(int par1, int par2) + public BlockHolySapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holysappling"); + } + /** * Ticks the block if it's been scheduled */ @@ -45,7 +52,7 @@ public class BlockHolySapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockHolySapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Gets passed in the blockID of the block below and supposed to return true if its allowed to grow on the type of @@ -123,14 +130,14 @@ public class BlockHolySapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java index 9554a3746..ae4b8b193 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolySlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -24,11 +25,17 @@ public class BlockHolySlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holyplank"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +51,15 @@ public class BlockHolySlab extends BlockHalfSlab default: return 129; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +88,7 @@ public class BlockHolySlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStairs.java index 99926ccfe..8a6f60788 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,18 @@ public class BlockHolyStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockHolyStairs(int par1, Block par2Block, int par3) + public BlockHolyStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holyplank"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java index 2c9ea8002..7525e6537 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyStone.java @@ -6,16 +6,23 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockHolyStone extends Block { - public BlockHolyStone(int par1, int par2) + public BlockHolyStone(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holystone"); + } /** * Returns the ID of the items to drop on destruction. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java index 66769f772..793d7d1c8 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHolyTallGrass.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockHolyTallGrass extends Block { - protected BlockHolyTallGrass(int par1, int par2, Material par3Material) + protected BlockHolyTallGrass(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockHolyTallGrass extends Block this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:holytallgrass"); + } - public BlockHolyTallGrass(int par1, int par2) + public BlockHolyTallGrass(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } /** @@ -66,7 +73,7 @@ public class BlockHolyTallGrass extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHydrangea.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHydrangea.java index 40df9e474..244553865 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHydrangea.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockHydrangea.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockHydrangea extends Block { - protected BlockHydrangea(int par1, int par2, Material par3Material) + protected BlockHydrangea(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockHydrangea extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockHydrangea(int par1, int par2) + public BlockHydrangea(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:hydrangea"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -65,7 +72,7 @@ public class BlockHydrangea extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java index 0d0036830..beb5a19de 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,9 +20,14 @@ public class BlockMagicLog extends Block public BlockMagicLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 55; this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:magiclog"); + } /** * The type of render function that is called for this block @@ -71,7 +77,7 @@ public class BlockMagicLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -108,12 +114,12 @@ public class BlockMagicLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 55))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicPlank.java index 5dc0af5d9..2f385e2c9 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,9 +15,15 @@ public class BlockMagicPlank extends Block public BlockMagicPlank(int par1) { - super(par1, 56, Material.wood); + super(par1, Material.wood); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:magicplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java index d9a98ede0..2316ca3f4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,19 @@ public class BlockMagicSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"magic"}; - public BlockMagicSapling(int par1, int par2) + public BlockMagicSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:magicsappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +52,7 @@ public class BlockMagicSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockMagicSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockMagicSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java index c329dc88c..15a3cae1f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -24,10 +25,16 @@ public class BlockMagicSlab extends BlockHalfSlab this.useNeighborBrightness[blockID] = true; } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:magicplank"); + } + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -43,15 +50,15 @@ public class BlockMagicSlab extends BlockHalfSlab default: return 56; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -80,7 +87,7 @@ public class BlockMagicSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicStairs.java index 7ebd86fb1..47d1882fc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMagicStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,12 +13,17 @@ public class BlockMagicStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockMagicStairs(int par1, Block par2Block, int par3) + public BlockMagicStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:magicplank"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java index ce289d110..b380c3e33 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,14 +27,19 @@ public class BlockMangroveLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"mangrove"}; int[] adjacentTreeBlocks; - public BlockMangroveLeaves(int par1, int par2) + public BlockMangroveLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:mangroveleaves1")); + } public int getBlockColor() { @@ -95,7 +101,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.mangroveLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -207,7 +213,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -234,7 +240,7 @@ public class BlockMangroveLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -305,11 +311,11 @@ public class BlockMangroveLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java index cff8397af..ba77991d0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,11 +20,16 @@ public class BlockMangroveLog extends Block public BlockMangroveLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 61; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mangrovelog"); + } + /** * The type of render function that is called for this block */ @@ -72,7 +78,7 @@ public class BlockMangroveLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +115,12 @@ public class BlockMangroveLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 61))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangrovePlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangrovePlank.java index aeded7b66..6cfe5e580 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangrovePlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangrovePlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,10 +15,16 @@ public class BlockMangrovePlank extends Block public BlockMangrovePlank(int par1) { - super(par1, 62, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mangroveplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSapling.java index 2784bc33b..80b776bfb 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,19 @@ public class BlockMangroveSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"mangrove"}; - public BlockMangroveSapling(int par1, int par2) + public BlockMangroveSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mangrovesappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +52,7 @@ public class BlockMangroveSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockMangroveSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Gets passed in the blockID of the block below and supposed to return true if its allowed to grow on the type of @@ -123,14 +130,14 @@ public class BlockMangroveSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java index c9af6dfb5..0111a6f0c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -24,11 +25,17 @@ public class BlockMangroveSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mangroveplank"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +51,15 @@ public class BlockMangroveSlab extends BlockHalfSlab default: return 62; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +88,7 @@ public class BlockMangroveSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveStairs.java index 909034eca..30220451f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMangroveStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,18 @@ public class BlockMangroveStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockMangroveStairs(int par1, Block par2Block, int par3) + public BlockMangroveStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mangroveplank"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java index 9c5af92d6..e25cddd9c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMediumGrass.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,6 +27,12 @@ public class BlockMediumGrass extends BlockFlower this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mediumgrass"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java index 89dd014fb..983bea8d6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMoss.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,11 +22,17 @@ public class BlockMoss extends Block { public BlockMoss(int par1) { - super(par1, 143, Material.vine); + super(par1, Material.vine); this.setBurnProperties(this.blockID, 15, 100); this.setTickRandomly(true); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:moss"); + } + /** * Sets the block's bounds for rendering it as an item */ @@ -210,7 +217,7 @@ public class BlockMoss extends Block { if (var6 != var5) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6, 2); } return true; @@ -248,7 +255,7 @@ public class BlockMoss extends Block if (!par1World.isRemote && !this.canVineStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } @@ -314,7 +321,7 @@ public class BlockMoss extends Block if (var12 > 0) { - par1World.setBlockAndMetadataWithNotify(par2, par3 + 1, par4, this.blockID, var12); + par1World.setBlock(par2, par3 + 1, par4, this.blockID, var12, 2); } } } @@ -335,7 +342,7 @@ public class BlockMoss extends Block { if (Block.blocksList[var12].blockMaterial.isOpaque() && Block.blocksList[var12].renderAsNormalBlock()) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var9 | 1 << var11); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var9 | 1 << var11, 2); } } else @@ -345,23 +352,23 @@ public class BlockMoss extends Block if ((var9 & 1 << var13) != 0 && this.canBePlacedOn(par1World.getBlockId(par2 + Direction.offsetX[var11] + Direction.offsetX[var13], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var13]))) { - par1World.setBlockAndMetadataWithNotify(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 1 << var13); + par1World.setBlock(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 1 << var13, 2); } else if ((var9 & 1 << var14) != 0 && this.canBePlacedOn(par1World.getBlockId(par2 + Direction.offsetX[var11] + Direction.offsetX[var14], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var14]))) { - par1World.setBlockAndMetadataWithNotify(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 1 << var14); + par1World.setBlock(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 1 << var14, 2); } else if ((var9 & 1 << var13) != 0 && par1World.isAirBlock(par2 + Direction.offsetX[var11] + Direction.offsetX[var13], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var13]) && this.canBePlacedOn(par1World.getBlockId(par2 + Direction.offsetX[var13], par3, par4 + Direction.offsetZ[var13]))) { - par1World.setBlockAndMetadataWithNotify(par2 + Direction.offsetX[var11] + Direction.offsetX[var13], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var13], this.blockID, 1 << (var11 + 2 & 3)); + par1World.setBlock(par2 + Direction.offsetX[var11] + Direction.offsetX[var13], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var13], this.blockID, 1 << (var11 + 2 & 3), 2); } else if ((var9 & 1 << var14) != 0 && par1World.isAirBlock(par2 + Direction.offsetX[var11] + Direction.offsetX[var14], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var14]) && this.canBePlacedOn(par1World.getBlockId(par2 + Direction.offsetX[var14], par3, par4 + Direction.offsetZ[var14]))) { - par1World.setBlockAndMetadataWithNotify(par2 + Direction.offsetX[var11] + Direction.offsetX[var14], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var14], this.blockID, 1 << (var11 + 2 & 3)); + par1World.setBlock(par2 + Direction.offsetX[var11] + Direction.offsetX[var14], par3, par4 + Direction.offsetZ[var11] + Direction.offsetZ[var14], this.blockID, 1 << (var11 + 2 & 3), 2); } else if (this.canBePlacedOn(par1World.getBlockId(par2 + Direction.offsetX[var11], par3 + 1, par4 + Direction.offsetZ[var11]))) { - par1World.setBlockAndMetadataWithNotify(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 0); + par1World.setBlock(par2 + Direction.offsetX[var11], par3, par4 + Direction.offsetZ[var11], this.blockID, 0, 2); } } } @@ -375,7 +382,7 @@ public class BlockMoss extends Block if (var13 > 0) { - par1World.setBlockAndMetadataWithNotify(par2, par3 - 1, par4, this.blockID, var13); + par1World.setBlock(par2, par3 - 1, par4, this.blockID, var13, 2); } } else if (var12 == this.blockID) @@ -385,7 +392,7 @@ public class BlockMoss extends Block if (var14 != (var14 | var13)) { - par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var14 | var13); + par1World.setBlockMetadataWithNotify(par2, par3 - 1, par4, var14 | var13, 2); } } } @@ -420,7 +427,7 @@ public class BlockMoss extends Block if (var9 != 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var9, 2); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java index 086eb5660..cada43479 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMud.java @@ -19,6 +19,12 @@ public class BlockMud extends Block super(par1, Material.sand); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mud"); + } public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { @@ -41,10 +47,4 @@ public class BlockMud extends Block { return 4; } - - @Override - public void registerIcons(IconRegister par1IconRegister) - { - this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:blockGrapplingHook"); - } } \ No newline at end of file diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrick.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrick.java index ececbdb45..2830f8d5d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrick.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrick.java @@ -4,14 +4,21 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockMudBrick extends Block { - public BlockMudBrick(int par1, int par2) + public BlockMudBrick(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mudbrick"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java index 42a440f5d..19eb7c07d 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -23,11 +24,17 @@ public class BlockMudBrickSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mudbrick"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -43,15 +50,15 @@ public class BlockMudBrickSlab extends BlockHalfSlab default: return 52; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -80,7 +87,7 @@ public class BlockMudBrickSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickStairs.java index c20f31be0..033b185d6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockMudBrickStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,12 +13,17 @@ public class BlockMudBrickStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockMudBrickStairs(int par1, Block par2Block, int par3) + public BlockMudBrickStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mudbrick"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeFlower.java index a0cf97a00..3cdfb03cb 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeFlower.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockOrangeFlower extends Block { - protected BlockOrangeFlower(int par1, int par2, Material par3Material) + protected BlockOrangeFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockOrangeFlower extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockOrangeFlower(int par1, int par2) + public BlockOrangeFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:orangeflower"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -65,7 +72,7 @@ public class BlockOrangeFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java index c3e5b14d5..85af1cdd7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,15 +26,20 @@ public class BlockOrangeLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"orange"}; int[] adjacentTreeBlocks; - public BlockOrangeLeaves(int par1, int par2) + public BlockOrangeLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setBurnProperties(this.blockID, 30, 60); this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:orangeleaves1")); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -55,7 +61,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.orangeLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockOrangeLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -270,11 +276,11 @@ public class BlockOrangeLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeSapling.java index 0eb32b030..5b8e43f2b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOrangeSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,20 @@ public class BlockOrangeSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"orange"}; - public BlockOrangeSapling(int par1, int par2) + public BlockOrangeSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:acacialeaves2"); + } + /** * Ticks the block if it's been scheduled */ @@ -45,7 +52,7 @@ public class BlockOrangeSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockOrangeSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockOrangeSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java index 0f0ec8e25..ab577d892 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginGrass.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -15,23 +16,28 @@ public class BlockOriginGrass extends Block public BlockOriginGrass(int par1) { super(par1, Material.grass); - this.blockIndexInTexture = 33; this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:origingrass1"); + } + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { return par1 == 1 ? 32 : (par1 == 0 ? 34 : 33); - } + }*/ /** * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side */ - public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + /*public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 1) { @@ -46,7 +52,7 @@ public class BlockOriginGrass extends Block Material var6 = par1IBlockAccess.getBlockMaterial(par2, par3 + 1, par4); return var6 != Material.snow && var6 != Material.craftedSnow ? 33 : 33; } - } + }*/ /** * Ticks the block if it's been scheduled @@ -57,7 +63,7 @@ public class BlockOriginGrass extends Block { if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && Block.lightOpacity[par1World.getBlockId(par2, par3 + 1, par4)] > 2) { - par1World.setBlockWithNotify(par2, par3, par4, Block.dirt.blockID); + par1World.setBlock(par2, par3, par4, Block.dirt.blockID); } else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) { @@ -70,7 +76,7 @@ public class BlockOriginGrass extends Block if (par1World.getBlockId(var7, var8, var9) == Block.dirt.blockID && par1World.getBlockLightValue(var7, var8 + 1, var9) >= 4 && Block.lightOpacity[var10] <= 2) { - par1World.setBlockWithNotify(var7, var8, var9, mod_BiomesOPlenty.originGrass.blockID); + par1World.setBlock(var7, var8, var9, mod_BiomesOPlenty.originGrass.blockID); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java index e6985854d..fbdd2ec22 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,15 +26,20 @@ public class BlockOriginLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"origin"}; int[] adjacentTreeBlocks; - public BlockOriginLeaves(int par1, int par2) + public BlockOriginLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:originleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:originleaves1")); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -55,7 +61,7 @@ public class BlockOriginLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.originLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockOriginLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockOriginLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -265,11 +271,11 @@ public class BlockOriginLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java index fd7054fe1..19916adf4 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockOriginSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,19 @@ public class BlockOriginSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"origin"}; - public BlockOriginSapling(int par1, int par2) + public BlockOriginSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:originsappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +52,7 @@ public class BlockOriginSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockOriginSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Gets passed in the blockID of the block below and supposed to return true if its allowed to grow on the type of @@ -124,14 +131,14 @@ public class BlockOriginSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java index 432dad8ee..7e8cbc64a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,15 +27,20 @@ public class BlockPalmLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"palm"}; int[] adjacentTreeBlocks; - public BlockPalmLeaves(int par1, int par2) + public BlockPalmLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:palmleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:palmleaves1")); + } + public int getBlockColor() { double var1 = 0.5D; @@ -95,7 +101,7 @@ public class BlockPalmLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.palmLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -207,7 +213,7 @@ public class BlockPalmLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -234,7 +240,7 @@ public class BlockPalmLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -305,11 +311,11 @@ public class BlockPalmLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java index 075185717..71c47c576 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,10 +20,15 @@ public class BlockPalmLog extends Block public BlockPalmLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 59; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:palmlog"); + } /** * The type of render function that is called for this block @@ -72,7 +78,7 @@ public class BlockPalmLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +115,12 @@ public class BlockPalmLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 59))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmPlank.java index 76d390ae2..3a4a608e6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,10 +15,16 @@ public class BlockPalmPlank extends Block public BlockPalmPlank(int par1) { - super(par1, 60, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:palmplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSapling.java index c125bcb60..74db92bb1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -23,14 +24,20 @@ public class BlockPalmSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"palm"}; - public BlockPalmSapling(int par1, int par2) + public BlockPalmSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:palmsappling"); + } + /** * Ticks the block if it's been scheduled */ @@ -46,7 +53,7 @@ public class BlockPalmSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -59,11 +66,11 @@ public class BlockPalmSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -125,14 +132,14 @@ public class BlockPalmSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java index 840696cd7..0fa4b6fb7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -25,10 +26,16 @@ public class BlockPalmSlab extends BlockHalfSlab this.useNeighborBrightness[blockID] = true; } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:palmplank"); + } + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +51,15 @@ public class BlockPalmSlab extends BlockHalfSlab default: return 60; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +88,7 @@ public class BlockPalmSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmStairs.java index bd73e959d..be27efb0b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPalmStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,18 @@ public class BlockPalmStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockPalmStairs(int par1, Block par2Block, int par3) + public BlockPalmStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setBurnProperties(this.blockID, 5, 20); this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:palmplank"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java index 7824e0d26..7de2ed846 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkFlower.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockPinkFlower extends Block { - protected BlockPinkFlower(int par1, int par2, Material par3Material) + protected BlockPinkFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockPinkFlower extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockPinkFlower(int par1, int par2) + public BlockPinkFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:pinkflower"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -65,7 +72,7 @@ public class BlockPinkFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java index 6d980869f..acb1c1145 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,14 +26,19 @@ public class BlockPinkLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"pink"}; int[] adjacentTreeBlocks; - public BlockPinkLeaves(int par1, int par2) + public BlockPinkLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setBurnProperties(this.blockID, 30, 60); this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:pinkleaves1")); + } /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate @@ -55,7 +61,7 @@ public class BlockPinkLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.pinkLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockPinkLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockPinkLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -265,11 +271,11 @@ public class BlockPinkLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkSapling.java index 25e7285dd..04d86a23e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPinkSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,20 @@ public class BlockPinkSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"cherry"}; - public BlockPinkSapling(int par1, int par2) + public BlockPinkSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:pinksappling"); + } + /** * Ticks the block if it's been scheduled */ @@ -45,7 +52,7 @@ public class BlockPinkSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockPinkSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) - { - par2 &= 3; - return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + //public int getBlockTextureFromSideAndMetadata(int par1, int par2) + //{ + // par2 &= 3; + // return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); + //} /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockPinkSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java index 612eaeedd..d2c31d9b7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPromisedPortal.java @@ -18,15 +18,22 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; public class BlockPromisedPortal extends Block { - public BlockPromisedPortal(int par1, int par2) + public BlockPromisedPortal(int par1) { - super(par1, par2, Material.portal); + super(par1, Material.portal); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:portal"); + } @SideOnly(Side.CLIENT) diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPurpleFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPurpleFlower.java index 321e2c365..399d3487e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPurpleFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockPurpleFlower.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockPurpleFlower extends Block { - protected BlockPurpleFlower(int par1, int par2, Material par3Material) + protected BlockPurpleFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockPurpleFlower extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockPurpleFlower(int par1, int par2) + public BlockPurpleFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:purpleflower"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -65,7 +72,7 @@ public class BlockPurpleFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockQuicksand.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockQuicksand.java index 0b81b4ebc..7e657e72b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockQuicksand.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockQuicksand.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; @@ -14,11 +15,17 @@ import net.minecraft.world.IBlockAccess; public class BlockQuicksand extends Block { - public BlockQuicksand(int par1, int par2) + public BlockQuicksand(int par1) { - super(par1, par2, Material.sand); + super(par1, Material.sand); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:quicksand"); + } public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java index 937c49461..1f082b64b 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,15 +26,20 @@ public class BlockRedLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"red"}; int[] adjacentTreeBlocks; - public BlockRedLeaves(int par1, int par2) + public BlockRedLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:redleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:redleaves1")); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -55,7 +61,7 @@ public class BlockRedLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.redLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockRedLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockRedLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -265,11 +271,11 @@ public class BlockRedLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java index 94ccf72d4..d42535459 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRock.java @@ -6,17 +6,24 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockRedRock extends Block { - public BlockRedRock(int par1, int par2) + public BlockRedRock(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redrock"); + } + /** * Returns the ID of the items to drop on destruction. */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrick.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrick.java index 80e4cd6af..53c786e60 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrick.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrick.java @@ -4,14 +4,21 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockRedRockBrick extends Block { - public BlockRedRockBrick(int par1, int par2) + public BlockRedRockBrick(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redbrick"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java index 9df51ae88..2dfcd5247 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -23,11 +24,17 @@ public class BlockRedRockBrickSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redbrick"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -43,15 +50,15 @@ public class BlockRedRockBrickSlab extends BlockHalfSlab default: return 24; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -80,7 +87,7 @@ public class BlockRedRockBrickSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickStairs.java index aa1006fe5..187276378 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockBrickStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,12 +13,17 @@ public class BlockRedRockBrickStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockRedRockBrickStairs(int par1, Block par2Block, int par3) + public BlockRedRockBrickStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redbrick"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobble.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobble.java index c0457cef2..80934543e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobble.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobble.java @@ -4,14 +4,21 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; public class BlockRedRockCobble extends Block { - public BlockRedRockCobble(int par1, int par2) + public BlockRedRockCobble(int par1) { - super(par1, par2, Material.rock); + super(par1, Material.rock); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redcobble"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java index 89dd663b2..4d57859b0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -23,11 +24,17 @@ public class BlockRedRockCobbleSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redcobble"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -43,15 +50,15 @@ public class BlockRedRockCobbleSlab extends BlockHalfSlab default: return 23; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -80,7 +87,7 @@ public class BlockRedRockCobbleSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleStairs.java index 5a763baf2..6f8c8b831 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedRockCobbleStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,12 +13,17 @@ public class BlockRedRockCobbleStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockRedRockCobbleStairs(int par1, Block par2Block, int par3) + public BlockRedRockCobbleStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redcobble"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedSapling.java index 0681461e0..333b1cd59 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,20 @@ public class BlockRedSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"maple"}; - public BlockRedSapling(int par1, int par2) + public BlockRedSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redsappling"); + } + /** * Ticks the block if it's been scheduled */ @@ -45,7 +52,7 @@ public class BlockRedSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockRedSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockRedSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java index c88860b65..de63aa73c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,15 +27,20 @@ public class BlockRedwoodLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"redwood"}; int[] adjacentTreeBlocks; - public BlockRedwoodLeaves(int par1, int par2) + public BlockRedwoodLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:redwoodleaves1")); + } + public int getBlockColor() { double var1 = 0.5D; @@ -95,7 +101,7 @@ public class BlockRedwoodLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.redwoodLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -207,7 +213,7 @@ public class BlockRedwoodLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -234,7 +240,7 @@ public class BlockRedwoodLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -305,11 +311,11 @@ public class BlockRedwoodLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java index cc1cd909d..570a9cc3a 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,10 +20,15 @@ public class BlockRedwoodLog extends Block public BlockRedwoodLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 40; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redwoodlog"); + } /** * The type of render function that is called for this block @@ -72,7 +78,7 @@ public class BlockRedwoodLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +115,12 @@ public class BlockRedwoodLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 40))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodPlank.java index 6ec063231..b838433ec 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,10 +15,16 @@ public class BlockRedwoodPlank extends Block public BlockRedwoodPlank(int par1) { - super(par1, 41, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redwoodplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSapling.java index fd40686c1..21e931c6c 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,19 @@ public class BlockRedwoodSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"redwood"}; - public BlockRedwoodSapling(int par1, int par2) + public BlockRedwoodSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redwoodsappling"); + } /** * Ticks the block if it's been scheduled */ @@ -45,7 +51,7 @@ public class BlockRedwoodSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +64,11 @@ public class BlockRedwoodSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -114,14 +120,14 @@ public class BlockRedwoodSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java index 9bdfeeddb..eaf9c7c0f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -24,11 +25,17 @@ public class BlockRedwoodSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redwoodplank"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +51,15 @@ public class BlockRedwoodSlab extends BlockHalfSlab default: return 41; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +88,7 @@ public class BlockRedwoodSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodStairs.java index 55487099a..52731d5f0 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockRedwoodStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,18 @@ public class BlockRedwoodStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockRedwoodStairs(int par1, Block par2Block, int par3) + public BlockRedwoodStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setBurnProperties(this.blockID, 5, 20); this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:redwoodplank"); + } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java index 41d5659dd..8cda4abc7 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockShortGrass.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,6 +27,12 @@ public class BlockShortGrass extends BlockFlower this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:shortgrass"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSmolderingGrass.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSmolderingGrass.java index 2a519c377..699a34fc6 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSmolderingGrass.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSmolderingGrass.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -15,23 +16,28 @@ public class BlockSmolderingGrass extends Block public BlockSmolderingGrass(int par1) { super(par1, Material.grass); - this.blockIndexInTexture = 123; this.setTickRandomly(true); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:smolderinggrass1"); + } /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { return par1 == 1 ? 122 : (par1 == 0 ? 124 : 123); - } + }*/ /** * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side */ - public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + /*public int getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { if (par5 == 1) { @@ -46,7 +52,7 @@ public class BlockSmolderingGrass extends Block Material var6 = par1IBlockAccess.getBlockMaterial(par2, par3 + 1, par4); return var6 != Material.snow && var6 != Material.craftedSnow ? 123 : 123; } - } + }*/ /** * A randomly called display update to be able to add particles or other items for display diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java index 19957ec27..982f2c1ee 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockSprout.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -26,6 +27,12 @@ public class BlockSprout extends BlockFlower this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:sprout"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java index 941427fc5..79b3b9896 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockThorn.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +19,7 @@ import net.minecraft.world.World; public class BlockThorn extends Block { - protected BlockThorn(int par1, int par2, Material par3Material) + protected BlockThorn(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -27,11 +28,17 @@ public class BlockThorn extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockThorn(int par1, int par2) + public BlockThorn(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } - + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:thorn"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @@ -72,7 +79,7 @@ public class BlockThorn extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyCactus.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyCactus.java index fba666468..c9ec1def1 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyCactus.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyCactus.java @@ -7,13 +7,14 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.util.DamageSource; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockTinyCactus extends Block { - protected BlockTinyCactus(int par1, int par2, Material par3Material) + protected BlockTinyCactus(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -22,10 +23,16 @@ public class BlockTinyCactus extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockTinyCactus(int par1, int par2) + public BlockTinyCactus(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:cactus"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -67,7 +74,7 @@ public class BlockTinyCactus extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyFlower.java index 642e39682..7d6a2bafa 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTinyFlower.java @@ -5,6 +5,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; @@ -12,7 +13,7 @@ import net.minecraft.world.World; public class BlockTinyFlower extends Block { - protected BlockTinyFlower(int par1, int par2, Material par3Material) + protected BlockTinyFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -22,11 +23,17 @@ public class BlockTinyFlower extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockTinyFlower(int par1, int par2) + public BlockTinyFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:tinyflower"); + } + public int getBlockColor() { return 16777215; @@ -89,7 +96,7 @@ public class BlockTinyFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockToadstool.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockToadstool.java index 6fe9f436e..2039d0964 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockToadstool.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockToadstool.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockToadstool extends Block { - protected BlockToadstool(int par1, int par2, Material par3Material) + protected BlockToadstool(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,10 +21,16 @@ public class BlockToadstool extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockToadstool(int par1, int par2) + public BlockToadstool(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:toadstool"); + } /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z @@ -65,7 +72,7 @@ public class BlockToadstool extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTreeMoss.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTreeMoss.java index db7e2756f..a62385adc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTreeMoss.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockTreeMoss.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,11 +22,17 @@ public class BlockTreeMoss extends Block { public BlockTreeMoss(int par1) { - super(par1, 143, Material.vine); + super(par1, Material.vine); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 15, 100); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:treemoss"); + } /** * Sets the block's bounds for rendering it as an item @@ -212,7 +219,7 @@ public class BlockTreeMoss extends Block { if (var6 != var5) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6, 2); } return true; @@ -228,7 +235,7 @@ public class BlockTreeMoss extends Block if (!par1World.isRemote && !this.canVineStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } @@ -266,7 +273,7 @@ public class BlockTreeMoss extends Block if (var9 != 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var9, 2); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockViolet.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockViolet.java index c746f1aad..4deff0e86 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockViolet.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockViolet.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockViolet extends Block { - protected BlockViolet(int par1, int par2, Material par3Material) + protected BlockViolet(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,11 +21,17 @@ public class BlockViolet extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockViolet(int par1, int par2) + public BlockViolet(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:violet"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @@ -65,7 +72,7 @@ public class BlockViolet extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteFlower.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteFlower.java index 288f6f707..05b35df7f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteFlower.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteFlower.java @@ -5,13 +5,14 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; public class BlockWhiteFlower extends Block { - protected BlockWhiteFlower(int par1, int par2, Material par3Material) + protected BlockWhiteFlower(int par1, Material par3Material) { super(par1, par3Material); this.setTickRandomly(true); @@ -20,11 +21,17 @@ public class BlockWhiteFlower extends Block this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } - public BlockWhiteFlower(int par1, int par2) + public BlockWhiteFlower(int par1) { - this(par1, par2, Material.plants); + this(par1, Material.plants); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:whiteflower"); + } + /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @@ -65,7 +72,7 @@ public class BlockWhiteFlower extends Block if (!this.canBlockStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java index 39adb7ae8..645b34069 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,15 +26,20 @@ public class BlockWhiteLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"white"}; int[] adjacentTreeBlocks; - public BlockWhiteLeaves(int par1, int par2) + public BlockWhiteLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves2") : par1IconRegister.registerIcon("BiomesOPlenty:whiteleaves1")); + } + /** * ejects contained items into the world, and notifies neighbours of an update, as appropriate */ @@ -55,7 +61,7 @@ public class BlockWhiteLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.whiteLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -167,7 +173,7 @@ public class BlockWhiteLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -194,7 +200,7 @@ public class BlockWhiteLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -265,11 +271,11 @@ public class BlockWhiteLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteSapling.java index 369d06b0b..5fbbf0891 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWhiteSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,19 @@ public class BlockWhiteSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"white"}; - public BlockWhiteSapling(int par1, int par2) + public BlockWhiteSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:whitesappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +52,7 @@ public class BlockWhiteSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockWhiteSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockWhiteSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillow.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillow.java index 3f37f8e31..b83005c43 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillow.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillow.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,10 +22,16 @@ public class BlockWillow extends Block { public BlockWillow(int par1) { - super(par1, 143, Material.vine); + super(par1, Material.vine); this.setBurnProperties(this.blockID, 15, 100); this.setTickRandomly(true); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willow"); + } /** * Sets the block's bounds for rendering it as an item @@ -211,7 +218,7 @@ public class BlockWillow extends Block { if (var6 != var5) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6, 2); } return true; @@ -249,7 +256,7 @@ public class BlockWillow extends Block if (!par1World.isRemote && !this.canVineStay(par1World, par2, par3, par4)) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } } @@ -287,7 +294,7 @@ public class BlockWillow extends Block if (var9 != 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var9, 2); } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java index 4d2215ff4..53e92f53e 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLeaves.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,14 +27,19 @@ public class BlockWillowLeaves extends BlockLeavesBase public static final String[] LEAF_TYPES = new String[] {"willow"}; int[] adjacentTreeBlocks; - public BlockWillowLeaves(int par1, int par2) + public BlockWillowLeaves(int par1) { - super(par1, par2, Material.leaves, false); - this.baseIndexInPNG = par2; + super(par1, Material.leaves, false); this.setTickRandomly(true); this.setBurnProperties(this.blockID, 30, 60); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = (isOpaqueCube() ? par1IconRegister.registerIcon("BiomesOPlenty:willowleaves4") : par1IconRegister.registerIcon("BiomesOPlenty:willowleaves3")); + } public int getBlockColor() { @@ -95,7 +101,7 @@ public class BlockWillowLeaves extends BlockLeavesBase if (var12 == mod_BiomesOPlenty.willowLeaves.blockID) { int var13 = par1World.getBlockMetadata(par2 + var9, par3 + var10, par4 + var11); - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -207,7 +213,7 @@ public class BlockWillowLeaves extends BlockLeavesBase if (var12 >= 0) { - par1World.setBlockMetadata(par2, par3, par4, var6 & -9); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & -9, 2); } else { @@ -234,7 +240,7 @@ public class BlockWillowLeaves extends BlockLeavesBase private void removeLeaves(World par1World, int par2, int par3, int par4) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); - par1World.setBlockWithNotify(par2, par3, par4, 0); + par1World.setBlock(par2, par3, par4, 0); } /** @@ -305,11 +311,11 @@ public class BlockWillowLeaves extends BlockLeavesBase return Block.leaves.isOpaqueCube(); } - @Override + /*@Override public int getBlockTextureFromSideAndMetadata(int side, int metadata) { return blockIndexInTexture + (isOpaqueCube() ? 1 : 0); - } + }*/ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java index c9732d249..7a5dc99bc 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowLog.java @@ -6,6 +6,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -19,10 +20,15 @@ public class BlockWillowLog extends Block public BlockWillowLog(int par1) { super(par1, Material.wood); - this.blockIndexInTexture = 42; this.setBurnProperties(this.blockID, 5, 5); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willowlog"); + } /** * The type of render function that is called for this block @@ -72,7 +78,7 @@ public class BlockWillowLog extends Block if ((var13 & 8) == 0) { - par1World.setBlockMetadata(par2 + var9, par3 + var10, par4 + var11, var13 | 8); + par1World.setBlockMetadataWithNotify(par2 + var9, par3 + var10, par4 + var11, var13 | 8, 2); } } } @@ -109,12 +115,12 @@ public class BlockWillowLog extends Block /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { int var3 = par2 & 12; int var4 = par2 & 3; return var3 == 0 && (par1 == 1 || par1 == 0) ? 255 : (var3 == 4 && (par1 == 5 || par1 == 4) ? 255 : (var3 == 8 && (par1 == 2 || par1 == 3) ? 255 : (var4 == 1 ? 116 : (var4 == 2 ? 117 : (var4 == 3 ? 153 : 42))))); - } + }*/ /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowPlank.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowPlank.java index 30b3d9516..745f1396f 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowPlank.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowPlank.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -14,10 +15,16 @@ public class BlockWillowPlank extends Block public BlockWillowPlank(int par1) { - super(par1, 43, Material.wood); + super(par1, Material.wood); this.setBurnProperties(this.blockID, 5, 20); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willowplank"); + } /** * Determines the damage on the item the block drops. Used in cloth and wood. diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSapling.java index 257747727..eb2e0b2c2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,14 +23,20 @@ public class BlockWillowSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"willow"}; - public BlockWillowSapling(int par1, int par2) + public BlockWillowSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willowsappling"); + } + /** * Ticks the block if it's been scheduled */ @@ -45,7 +52,7 @@ public class BlockWillowSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockWillowSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockWillowSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java index 481bd6c1a..9a3d50be2 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowSlab.java @@ -7,6 +7,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.BlockHalfSlab; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; @@ -24,11 +25,18 @@ public class BlockWillowSlab extends BlockHalfSlab this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); this.useNeighborBrightness[blockID] = true; } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willowplank"); + } + /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { switch (par2 & 7) { @@ -44,15 +52,15 @@ public class BlockWillowSlab extends BlockHalfSlab default: return 43; } - } + }*/ /** * Returns the block texture based on the side being looked at. Args: side */ - public int getBlockTextureFromSide(int par1) + /*public int getBlockTextureFromSide(int par1) { return this.getBlockTextureFromSideAndMetadata(par1, 0); - } + }*/ /** * Returns the ID of the items to drop on destruction. @@ -81,7 +89,7 @@ public class BlockWillowSlab extends BlockHalfSlab par1 = 0; } - return super.getBlockName() + "." + woodType[par1]; + return super.getUnlocalizedName() + "." + woodType[par1]; } /** diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowStairs.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowStairs.java index 5bbe88ade..014275c29 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowStairs.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockWillowStairs.java @@ -4,6 +4,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.IBlockAccess; @@ -12,13 +13,19 @@ public class BlockWillowStairs extends BlockStairs /** The block that is used as model for the stair. */ private final Block modelBlock; - public BlockWillowStairs(int par1, Block par2Block, int par3) + public BlockWillowStairs(int par1, Block par2Block) { - super(par1, par2Block, par3); - blockIndexInTexture = par3; + super(par1, par2Block, 0); this.modelBlock = par2Block; this.setBurnProperties(this.blockID, 5, 20); this.setLightOpacity(0); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:willowplank"); + } + } diff --git a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockYellowSapling.java b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockYellowSapling.java index e44ee622a..6c71ada27 100644 --- a/src/minecraft/tdwp_ftw/biomesop/blocks/BlockYellowSapling.java +++ b/src/minecraft/tdwp_ftw/biomesop/blocks/BlockYellowSapling.java @@ -8,6 +8,7 @@ import tdwp_ftw.biomesop.mod_BiomesOPlenty; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,13 +23,19 @@ public class BlockYellowSapling extends BlockSapling { public static final String[] WOOD_TYPES = new String[] {"yellow"}; - public BlockYellowSapling(int par1, int par2) + public BlockYellowSapling(int par1) { - super(par1, par2); + super(par1); float var3 = 0.4F; this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, var3 * 2.0F, 0.5F + var3); this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:yellowsappling"); + } /** * Ticks the block if it's been scheduled @@ -45,7 +52,7 @@ public class BlockYellowSapling extends BlockSapling if ((var6 & 8) == 0) { - par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8); + par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 2); } else { @@ -58,11 +65,11 @@ public class BlockYellowSapling extends BlockSapling /** * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata */ - public int getBlockTextureFromSideAndMetadata(int par1, int par2) + /*public int getBlockTextureFromSideAndMetadata(int par1, int par2) { par2 &= 3; return par2 == 1 ? 63 : (par2 == 2 ? 79 : (par2 == 3 ? 30 : super.getBlockTextureFromSideAndMetadata(par1, par2))); - } + }*/ /** * Attempts to grow a sapling into a tree @@ -115,14 +122,14 @@ public class BlockYellowSapling extends BlockSapling { if (var10) { - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6); - par1World.setBlockAndMetadata(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6); + par1World.setBlock(par2 + var8, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9, this.blockID, var6, 2); + par1World.setBlock(par2 + var8, par3, par4 + var9 + 1, this.blockID, var6, 2); + par1World.setBlock(par2 + var8 + 1, par3, par4 + var9 + 1, this.blockID, var6, 2); } else { - par1World.setBlockAndMetadata(par2, par3, par4, this.blockID, var6); + par1World.setBlock(par2, par3, par4, this.blockID, var6, 2); } } } diff --git a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java index 6ad1cca3b..c9cbb0684 100644 --- a/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java +++ b/src/minecraft/tdwp_ftw/biomesop/mod_BiomesOPlenty.java @@ -468,7 +468,7 @@ public class mod_BiomesOPlenty glowFlower = (new BlockGlowFlower(glowFlowerID)).setHardness(0.0F).setLightValue(0.65F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("glowFlower"); cattail = (new BlockCattail(cattailID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("cattail"); willow = (new BlockWillow(willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("willow"); - autumnLeaves = (BlockAutumnLeaves)(new BlockAutumnLeaves(autumnLeavesID, 64)).setHardness(0.2F).setLightOpacity(1).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("autumnLeaves"); + autumnLeaves = (BlockAutumnLeaves)(new BlockAutumnLeaves(autumnLeavesID)).setHardness(0.2F).setLightOpacity(1).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("autumnLeaves"); thorn = (new BlockThorn(thornID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("thorn"); toadstool = (new BlockToadstool(toadstoolID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("toadstool"); highGrassBottom = (BlockHighGrassBottom)(new BlockHighGrassBottom(highGrassBottomID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("highGrassBottom"); @@ -537,7 +537,7 @@ public class mod_BiomesOPlenty holyGrass = (BlockHolyGrass)(new BlockHolyGrass(holyGrassID)).setHardness(1.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("holyGrass"); holyStone = (new BlockHolyStone(holyStoneID)).setHardness(1.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("holyStone"); holyTallGrass = (new BlockHolyTallGrass(holyTallGrassID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("holyTallGrass"); - promisedPortal = new BlockPromisedPortal(promisedLandPortalID, 1).setUnlocalizedName("promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F); + promisedPortal = new BlockPromisedPortal(promisedLandPortalID).setUnlocalizedName("promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F); holySapling = (new BlockHolySapling(holySaplingID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("holySapling"); amethystOre = (new BlockAmethystOre(amethystOreID)).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("amethystOre"); amethystBlock = (new BlockAmethystBlock(amethystBlockID)).setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("amethystBlock"); diff --git a/src/minecraft/tdwp_ftw/biomesop/res/block2.png b/src/minecraft/tdwp_ftw/biomesop/res/block2.png index b990ab653..4bbb4dbde 100644 Binary files a/src/minecraft/tdwp_ftw/biomesop/res/block2.png and b/src/minecraft/tdwp_ftw/biomesop/res/block2.png differ