Remove ModSubtiles.getTypes, format

This commit is contained in:
Vincent Lee committed 2020-07-17 11:38:52 -05:00
1 parent 1d1dd3a95a
commit f9e0d7cd8b
5 files changed
+62 -72

No files matched your search

@@ -8,13 +8,10 @@
*/
package vazkii.botania.client.core.handler;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.renderer.entity.SpriteRenderer;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.util.registry.Registry;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
@@ -31,6 +28,7 @@ import vazkii.botania.common.block.tile.ModTiles;
import vazkii.botania.common.entity.ModEntities;
import vazkii.botania.common.lib.LibMisc;
import static vazkii.botania.common.block.ModBlocks.register;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public final class ModelHandler {
@@ -50,7 +48,7 @@ public final class ModelHandler {
ModelLoader.addSpecialModel(prefix("block/gaia_spreader_inside"));
ModelLoader.addSpecialModel(prefix("block/mana_spreader_inside"));
ModelLoader.addSpecialModel(prefix("block/redstone_spreader_inside"));
registerSubtiles();
registerIslands();
ClientRegistry.bindTileEntityRenderer(ModTiles.ALTAR, RenderTileAltar::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.SPREADER, RenderTileSpreader::new);
@@ -60,10 +58,6 @@ public final class ModelHandler {
ClientRegistry.bindTileEntityRenderer(ModTiles.ENCHANTER, RenderTileEnchanter::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.ALF_PORTAL, RenderTileAlfPortal::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.MINI_ISLAND, RenderTileFloatingFlower::new);
ModSubtiles.getTypes().stream()
.map(Pair::getSecond)
.map(rl -> Registry.BLOCK_ENTITY_TYPE.getValue(rl).get())
.forEach(typ -> ClientRegistry.bindTileEntityRenderer(typ, RenderTileSpecialFlower::new));
ClientRegistry.bindTileEntityRenderer(ModTiles.TINY_POTATO, RenderTileTinyPotato::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.STARFIELD, RenderTileStarfield::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.BREWERY, RenderTileBrewery::new);
@@ -89,6 +83,56 @@ public final class ModelHandler {
ClientRegistry.bindTileEntityRenderer(ModTiles.AVATAR, RenderTileAvatar::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.ANIMATED_TORCH, RenderTileAnimatedTorch::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.PURE_DAISY, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.MANASTAR, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.HYDROANGEAS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.ENDOFLAME, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.THERMALILY, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.ROSA_ARCANA, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.MUNCHDEW, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.ENTROPINNYUM, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.KEKIMURUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.GOURMARYLLIS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.NARSLIMMUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.SPECTROLUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.DANDELIFEON, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.RAFFLOWSIA, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.SHULK_ME_NOT, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.BELLETHORNE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.BELLETHORNE_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.BERGAMUTE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.DREADTHORN, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.HEISEI_DREAM, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.TIGERSEYE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.JADED_AMARANTHUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.ORECHID, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.FALLEN_KANADE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.EXOFLAME, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.AGRICARNATION, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.AGRICARNATION_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.HOPPERHOCK, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.HOPPERHOCK_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.TANGLEBERRIE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.JIYUULIA, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.RANNUNCARPUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.RANNUNCARPUS_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.HYACIDUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.POLLIDISIAC, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.CLAYCONIA, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.CLAYCONIA_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.LOONIUM, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.DAFFOMILL, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.VINCULOTUS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.SPECTRANTHEMUM, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.MEDUMONE, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.MARIMORPHOSIS, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.MARIMORPHOSIS_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.BUBBELL, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.BUBBELL_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.SOLEGNOLIA, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.SOLEGNOLIA_CHIBI, RenderTileSpecialFlower::new);
ClientRegistry.bindTileEntityRenderer(ModSubtiles.ORECHID_IGNEM, RenderTileSpecialFlower::new);
RenderingRegistry.registerEntityRenderingHandler(ModEntities.MANA_BURST, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(ModEntities.PLAYER_MOVER, RenderNoop::new);
RenderingRegistry.registerEntityRenderingHandler(ModEntities.SIGNAL_FLARE, RenderNoop::new);
@@ -111,7 +155,7 @@ public final class ModelHandler {
RenderingRegistry.registerEntityRenderingHandler(ModEntities.ENDER_AIR_BOTTLE, renderManager -> new SpriteRenderer<>(renderManager, Minecraft.getInstance().getItemRenderer()));
}
private static void registerSubtiles() {
private static void registerIslands() {
BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, prefix("block/islands/island_grass"));
BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, prefix("block/islands/island_podzol"));
BotaniaAPIClient.instance().registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, prefix("block/islands/island_mycel"));
@@ -135,11 +135,11 @@ public final class RenderHelper {
SPINNING_CUBE = RenderType.makeType(LibResources.PREFIX_MOD + "spinning_cube", DefaultVertexFormats.ENTITY, GL11.GL_QUADS, 64, glState);
glState = RenderType.State.getBuilder()
.texture(new RenderState.TextureState())
.diffuseLighting(enableDiffuse)
.transparency(TRANSLUCENT_TRANSPARENCY)
.target(itemTarget)
.build(false);
.texture(new RenderState.TextureState())
.diffuseLighting(enableDiffuse)
.transparency(TRANSLUCENT_TRANSPARENCY)
.target(itemTarget)
.build(false);
SPINNING_CUBE_GHOST = RenderType.makeType(LibResources.PREFIX_MOD + "spinning_cube_ghost", DefaultVertexFormats.ENTITY, GL11.GL_QUADS, 64, glState);
glState = RenderType.State.getBuilder().texture(mipmapBlockAtlasTexture)
@@ -13,8 +13,8 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TranslationTextComponent;
import vazkii.botania.api.recipe.IBrewRecipe;
import vazkii.botania.common.Botania;
import vazkii.botania.common.crafting.ModRecipeTypes;
@@ -235,58 +235,8 @@ public class ModSubtiles {
return new ResourceLocation(orig.getNamespace(), orig.getPath() + "_chibi");
}
public static List<Pair<Supplier<? extends TileEntitySpecialFlower>, ResourceLocation>> getTypes() {
return ImmutableList.of(
Pair.of(SubTilePureDaisy::new, LibBlockNames.SUBTILE_PUREDAISY),
Pair.of(SubTileManastar::new, LibBlockNames.SUBTILE_MANASTAR),
Pair.of(SubTileEndoflame::new, LibBlockNames.SUBTILE_ENDOFLAME),
Pair.of(SubTileHydroangeas::new, LibBlockNames.SUBTILE_HYDROANGEAS),
Pair.of(SubTileThermalily::new, LibBlockNames.SUBTILE_THERMALILY),
Pair.of(SubTileArcaneRose::new, LibBlockNames.SUBTILE_ARCANE_ROSE),
Pair.of(SubTileMunchdew::new, LibBlockNames.SUBTILE_MUNCHDEW),
Pair.of(SubTileEntropinnyum::new, LibBlockNames.SUBTILE_ENTROPINNYUM),
Pair.of(SubTileKekimurus::new, LibBlockNames.SUBTILE_KEKIMURUS),
Pair.of(SubTileGourmaryllis::new, LibBlockNames.SUBTILE_GOURMARYLLIS),
Pair.of(SubTileNarslimmus::new, LibBlockNames.SUBTILE_NARSLIMMUS),
Pair.of(SubTileSpectrolus::new, LibBlockNames.SUBTILE_SPECTROLUS),
Pair.of(SubTileDandelifeon::new, LibBlockNames.SUBTILE_DANDELIFEON),
Pair.of(SubTileRafflowsia::new, LibBlockNames.SUBTILE_RAFFLOWSIA),
Pair.of(SubTileShulkMeNot::new, LibBlockNames.SUBTILE_SHULK_ME_NOT),
Pair.of(SubTileBellethorn::new, LibBlockNames.SUBTILE_BELLETHORN),
Pair.of(SubTileBellethorn.Mini::new, chibi(LibBlockNames.SUBTILE_BELLETHORN)),
Pair.of(SubTileBergamute::new, LibBlockNames.SUBTILE_BERGAMUTE),
Pair.of(SubTileDreadthorn::new, LibBlockNames.SUBTILE_DREADTHORN),
Pair.of(SubTileHeiseiDream::new, LibBlockNames.SUBTILE_HEISEI_DREAM),
Pair.of(SubTileTigerseye::new, LibBlockNames.SUBTILE_TIGERSEYE),
Pair.of(SubTileJadedAmaranthus::new, LibBlockNames.SUBTILE_JADED_AMARANTHUS),
Pair.of(SubTileOrechid::new, LibBlockNames.SUBTILE_ORECHID),
Pair.of(SubTileFallenKanade::new, LibBlockNames.SUBTILE_FALLEN_KANADE),
Pair.of(SubTileExoflame::new, LibBlockNames.SUBTILE_EXOFLAME),
Pair.of(SubTileAgricarnation::new, LibBlockNames.SUBTILE_AGRICARNATION),
Pair.of(SubTileAgricarnation.Mini::new, chibi(LibBlockNames.SUBTILE_AGRICARNATION)),
Pair.of(SubTileHopperhock::new, LibBlockNames.SUBTILE_HOPPERHOCK),
Pair.of(SubTileHopperhock.Mini::new, chibi(LibBlockNames.SUBTILE_HOPPERHOCK)),
Pair.of(SubTileTangleberrie::new, LibBlockNames.SUBTILE_TANGLEBERRIE),
Pair.of(SubTileJiyuulia::new, LibBlockNames.SUBTILE_JIYUULIA),
Pair.of(SubTileRannuncarpus::new, LibBlockNames.SUBTILE_RANNUNCARPUS),
Pair.of(SubTileRannuncarpus.Mini::new, chibi(LibBlockNames.SUBTILE_RANNUNCARPUS)),
Pair.of(SubTileHyacidus::new, LibBlockNames.SUBTILE_HYACIDUS),
Pair.of(SubTilePollidisiac::new, LibBlockNames.SUBTILE_POLLIDISIAC),
Pair.of(SubTileClayconia::new, LibBlockNames.SUBTILE_CLAYCONIA),
Pair.of(SubTileClayconia.Mini::new, chibi(LibBlockNames.SUBTILE_CLAYCONIA)),
Pair.of(SubTileLoonuim::new, LibBlockNames.SUBTILE_LOONIUM),
Pair.of(SubTileDaffomill::new, LibBlockNames.SUBTILE_DAFFOMILL),
Pair.of(SubTileVinculotus::new, LibBlockNames.SUBTILE_VINCULOTUS),
Pair.of(SubTileSpectranthemum::new, LibBlockNames.SUBTILE_SPECTRANTHEMUM),
Pair.of(SubTileMedumone::new, LibBlockNames.SUBTILE_MEDUMONE),
Pair.of(SubTileMarimorphosis::new, LibBlockNames.SUBTILE_MARIMORPHOSIS),
Pair.of(SubTileMarimorphosis.Mini::new, chibi(LibBlockNames.SUBTILE_MARIMORPHOSIS)),
Pair.of(SubTileBubbell::new, LibBlockNames.SUBTILE_BUBBELL),
Pair.of(SubTileBubbell.Mini::new, chibi(LibBlockNames.SUBTILE_BUBBELL)),
Pair.of(SubTileSolegnolia::new, LibBlockNames.SUBTILE_SOLEGNOLIA),
Pair.of(SubTileSolegnolia.Mini::new, chibi(LibBlockNames.SUBTILE_SOLEGNOLIA)),
Pair.of(SubTileOrechidIgnem::new, LibBlockNames.SUBTILE_ORECHID_IGNEM)
);
private static ResourceLocation getId(Block b) {
return Registry.BLOCK.getKey(b);
}
public static void registerBlocks(RegistryEvent.Register<Block> evt) {
@@ -574,10 +524,6 @@ public class ModSubtiles {
register(r, getId(orechidIgnem), new ItemBlockSpecialFlower(orechidIgnem, props));
register(r, getId(orechidIgnemFloating), new ItemBlockSpecialFlower(orechidIgnemFloating, props));
}
private static ResourceLocation getId(Block b) {
return Registry.BLOCK.getKey(b);
}
public static void registerTEs(RegistryEvent.Register<TileEntityType<?>> evt) {
IForgeRegistry<TileEntityType<?>> r = evt.getRegistry();
@@ -54,7 +54,7 @@ public class SubTileShulkMeNot extends TileEntityGeneratingFlower {
if (shulker.isAlive() && shulker.getDistanceSq(posD) < RADIUS * RADIUS) {
LivingEntity target = shulker.getAttackTarget();
if (target instanceof IMob && target.isAlive()
&& target.getDistanceSq(posD) < RADIUS * RADIUS && target.getActivePotionEffect(Effects.LEVITATION) != null) {
&& target.getDistanceSq(posD) < RADIUS * RADIUS && target.getActivePotionEffect(Effects.LEVITATION) != null) {
target.remove();
shulker.remove();