mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 04:32:23 +00:00
Clean up some todos
This commit is contained in:
6 files changed
+10
-31
No files matched your search
@@ -121,7 +121,6 @@ import static vazkii.botania.common.item.ModItems.*;
|
||||
|
||||
public final class ModelHandler {
|
||||
|
||||
// todo reorganize, alphabetize
|
||||
public static void registerModels() {
|
||||
ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
|
||||
OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT));
|
||||
@@ -525,7 +524,7 @@ public final class ModelHandler {
|
||||
registerItemModel(ModBlocks.avatar);
|
||||
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class);
|
||||
|
||||
registerItemModel(ModBlocks.bellows); // todo await animation api
|
||||
registerItemModel(ModBlocks.bellows);
|
||||
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class);
|
||||
|
||||
registerItemModel(ModBlocks.brewery);
|
||||
@@ -534,13 +533,13 @@ public final class ModelHandler {
|
||||
registerItemModel(ModBlocks.corporeaCrystalCube);
|
||||
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class);
|
||||
|
||||
registerItemModel(ModBlocks.corporeaIndex); // todo json maybe? await animation api
|
||||
registerItemModel(ModBlocks.corporeaIndex);
|
||||
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class);
|
||||
|
||||
registerItemModel(ModItems.gaiaHead);
|
||||
ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class);
|
||||
|
||||
registerItemModel(ModBlocks.hourglass); // todo json maybe?
|
||||
registerItemModel(ModBlocks.hourglass);
|
||||
ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class);
|
||||
|
||||
registerItemModel(ModBlocks.teruTeruBozu);
|
||||
|
||||
@@ -121,19 +121,6 @@ public class PlatformModel implements IBakedModel {
|
||||
|
||||
@Override
|
||||
public TileEntity getTileEntity(@Nonnull BlockPos pos) {
|
||||
/* todo is this actually needed? if so this can't be an iblockaccess anymore
|
||||
IBlockState state = getBlockState(pos);
|
||||
if(state == null || !state.getBlock().hasTileEntity(state))
|
||||
return null;
|
||||
|
||||
TileEntity tile = state.getBlock().createTileEntity(this, state);
|
||||
if(tile == null)
|
||||
return null;
|
||||
|
||||
tile.setWorldObj(this);
|
||||
tile.setPos(pos);
|
||||
|
||||
return tile;*/
|
||||
return compose.getTileEntity(pos);
|
||||
}
|
||||
|
||||
|
||||
@@ -57,8 +57,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo
|
||||
}
|
||||
|
||||
@Optional.Method(modid = "CoFHAPI|energy")
|
||||
protected final int transmitEnergy(int energy) {
|
||||
// TODO: Share energy amoung receivers ?
|
||||
private final int transmitEnergy(int energy) {
|
||||
for(Map.Entry<EnumFacing, IEnergyReceiver> e : receiverCache.entrySet()) {
|
||||
IEnergyReceiver tile = e.getValue();
|
||||
if (tile == null)
|
||||
|
||||
@@ -187,10 +187,6 @@ public final class ConfigHandler {
|
||||
desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING";
|
||||
glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit);
|
||||
|
||||
// todo - this has been split into a separate respack for now
|
||||
// desc = "Set this to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f";
|
||||
// altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures);
|
||||
|
||||
desc = "Set this to true if you are the chosen one. For lovers of glitch art and just general mad people.";
|
||||
matrixMode = loadPropBool("matrixMode.enabled", desc, matrixMode);
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ public final class ModMigrationRecipes {
|
||||
if (quark) {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_stairs")), new ItemStack(ModFluffBlocks.endStoneStairs));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("end_bricks_slab")), new ItemStack(ModFluffBlocks.endStoneSlab));
|
||||
// todo End stone chiseled brick? (not in quark)
|
||||
// End stone chiseled brick - not in quark
|
||||
}
|
||||
|
||||
// Andesite normal + polished -> vanilla
|
||||
@@ -64,7 +64,7 @@ public final class ModMigrationRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 2), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.ANDESITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[4]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[4]));
|
||||
// todo Andesite chiseled brick? (not in quark)
|
||||
// Andesite chiseled brick - not in quark
|
||||
// Andesite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_andesite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.ANDESITE.ordinal()));
|
||||
}
|
||||
@@ -80,7 +80,7 @@ public final class ModMigrationRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 3), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.BASALT_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[5]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_basalt_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[5]));
|
||||
// todo Basalt chiseled brick? (not in quark)
|
||||
// Basalt chiseled brick - not in quark
|
||||
// Basalt wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("basalt_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.BASALT.ordinal()));
|
||||
}
|
||||
@@ -97,7 +97,7 @@ public final class ModMigrationRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 1), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.DIORITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[6]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[6]));
|
||||
// todo Diorite chiseled brick? (not in quark)
|
||||
// Diorite chiseled brick - not in quark
|
||||
// Diorite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_diorite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.DIORITE.ordinal()));
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public final class ModMigrationRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("world_stone_bricks"), 1, 0), new ItemStack(ModFluffBlocks.stone, 1, FutureStoneVariant.GRANITE_BRICK.ordinal()));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_stairs")), new ItemStack(ModFluffBlocks.stoneStairs[7]));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_bricks_slab")), new ItemStack(ModFluffBlocks.stoneSlabs[7]));
|
||||
// todo Granite chiseled brick? (not in quark)
|
||||
// Granite chiseled brick - not in quark
|
||||
// Granite wall
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(findQuarkBlock("stone_granite_wall")), new ItemStack(ModFluffBlocks.stoneWall, 1, FutureStoneVariant.GRANITE.ordinal()));
|
||||
}
|
||||
|
||||
@@ -155,8 +155,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
|
||||
public void onUpdate() {
|
||||
setTicksExisted(getTicksExisted() + 1);
|
||||
super.onUpdate();
|
||||
// superUpdate(); todo 1.9 removed a ton of what appears to just be copied superclass code
|
||||
// todo 1.9 if shit breaks revert this :P
|
||||
|
||||
if(!fake && !isDead)
|
||||
ping();
|
||||
@@ -560,7 +558,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
|
||||
public ItemStack getSourceLens() {
|
||||
Optional<ItemStack> stack = dataManager.get(SOURCE_LENS);
|
||||
if(!stack.isPresent())
|
||||
return new ItemStack(Blocks.STONE, 0, 0); // todo 1.9 refact later
|
||||
return new ItemStack(Blocks.STONE, 0, 0);
|
||||
else return stack.get();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user