mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Tons of fixes to try to get things to load
This commit is contained in:
1 parent
8908871e7b
commit
7c4797177d
671 files changed
+1691
-3711
No files matched your search
@@ -495,7 +495,7 @@ public final class BotaniaAPI {
|
||||
* The fact I have to write that means some moron already tried, don't be that moron.
|
||||
* @see IInternalMethodHandler
|
||||
*/
|
||||
public static IInternalMethodHandler internalHandler = new DummyMethodHandler();
|
||||
public static volatile IInternalMethodHandler internalHandler = new DummyMethodHandler();
|
||||
|
||||
/**
|
||||
* Registers a new Knowledge Type.
|
||||
@@ -625,7 +625,7 @@ public final class BotaniaAPI {
|
||||
*/
|
||||
public static RecipeManaInfusion registerManaAlchemyRecipe(ItemStack output, Ingredient input, int mana) {
|
||||
RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana);
|
||||
recipe.setCatalyst(RecipeManaInfusion.alchemyState);
|
||||
recipe.setCatalyst(RecipeManaInfusion.alchemy.getDefaultState());
|
||||
return recipe;
|
||||
}
|
||||
|
||||
@@ -636,7 +636,7 @@ public final class BotaniaAPI {
|
||||
*/
|
||||
public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Ingredient input, int mana) {
|
||||
RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana);
|
||||
recipe.setCatalyst(RecipeManaInfusion.conjurationState);
|
||||
recipe.setCatalyst(RecipeManaInfusion.conjuration.getDefaultState());
|
||||
return recipe;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,22 +10,26 @@
|
||||
*/
|
||||
package vazkii.botania.api.recipe;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RecipeManaInfusion {
|
||||
@ObjectHolder("botania:alchemy_catalyst")
|
||||
public static Block alchemy;
|
||||
|
||||
@ObjectHolder("botania:conjuration_catalyst")
|
||||
public static Block conjuration;
|
||||
|
||||
private final ItemStack output;
|
||||
private final Ingredient input;
|
||||
private final int mana;
|
||||
private @Nullable IBlockState catalystState;
|
||||
|
||||
public static IBlockState alchemyState;
|
||||
public static IBlockState conjurationState;
|
||||
|
||||
public RecipeManaInfusion(ItemStack output, Ingredient input, int mana) {
|
||||
this.output = output;
|
||||
this.input = input;
|
||||
|
||||
@@ -19,7 +19,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion {
|
||||
|
||||
public RecipeMiniFlower(ResourceLocation mini, ResourceLocation flower, int mana) {
|
||||
super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(mini)), mana);
|
||||
setCatalyst(RecipeManaInfusion.alchemyState);
|
||||
setCatalyst(RecipeManaInfusion.alchemy.getDefaultState());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,6 +15,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraft.world.FoliageColors;
|
||||
import net.minecraft.world.biome.BiomeColors;
|
||||
import net.minecraftforge.registries.IRegistryDelegate;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.brew.Brew;
|
||||
@@ -48,17 +50,10 @@ public final class ColorHandler {
|
||||
|
||||
public static void init() {
|
||||
BlockColors blocks = Minecraft.getInstance().getBlockColors();
|
||||
Map<IRegistryDelegate<Block>, IBlockColor> map;
|
||||
try {
|
||||
Field f = BlockColors.class.getField("colors");
|
||||
f.setAccessible(true);
|
||||
map = (Map<IRegistryDelegate<Block>, IBlockColor>) f.get(blocks);
|
||||
} catch (ReflectiveOperationException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
|
||||
// Steal vine colorer
|
||||
blocks.register(map.get(Blocks.VINE.delegate), ModBlocks.solidVines);
|
||||
// [VanillaCopy] BlockColors for vine
|
||||
IBlockColor vineColor = (state, world, pos, tint) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefault();
|
||||
blocks.register(vineColor, ModBlocks.solidVines);
|
||||
|
||||
// Pool
|
||||
blocks.register(
|
||||
@@ -119,10 +114,10 @@ public final class ColorHandler {
|
||||
ModItems.twigWand);
|
||||
|
||||
IItemColor handler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue;
|
||||
Item[] dyes = ModItems.dyes.values().toArray(new Item[0]);
|
||||
Item[] petals = ModItems.petals.values().toArray(new Item[0]);
|
||||
items.register(handler, dyes);
|
||||
items.register(handler, petals);
|
||||
for(EnumDyeColor color : EnumDyeColor.values()) {
|
||||
items.register(handler, ModItems.getPetal(color));
|
||||
items.register(handler, ModItems.getDye(color));
|
||||
}
|
||||
|
||||
items.register((s, t) -> Minecraft.getInstance().getBlockColors().getColor(((ItemBlock)s.getItem()).getBlock().getDefaultState(), null, null, t),
|
||||
ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue,
|
||||
|
||||
@@ -81,10 +81,10 @@ public class MiscellaneousIcons {
|
||||
public void onModelBake(ModelBakeEvent evt) {
|
||||
// Floating flowers
|
||||
FloatingFlowerModel model = new FloatingFlowerModel();
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:miniIsland", "normal"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:miniIsland", "inventory"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:mini_island", "normal"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:mini_island", "inventory"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:floating_special_flower", "normal"), model);
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:floating_special_flower", "inventory"), model);
|
||||
|
||||
// Platforms
|
||||
ModelResourceLocation abstruseName = new ModelResourceLocation("botania:abstruse_platform", "normal");
|
||||
@@ -102,18 +102,22 @@ public class MiscellaneousIcons {
|
||||
IBakedModel original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon", "inventory"));
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon", "inventory"),
|
||||
new LexiconModel(original));
|
||||
/* todo 1.13 models referenced using overrides aren't put in the model registry?
|
||||
original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon_elven", "inventory"));
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon_elven", "inventory"),
|
||||
new LexiconModel(original));
|
||||
*/
|
||||
|
||||
// Mana Blaster
|
||||
ModelResourceLocation key = new ModelResourceLocation("botania:managun", "inventory");
|
||||
ModelResourceLocation key = new ModelResourceLocation("botania:mana_gun", "inventory");
|
||||
IBakedModel originalModel = evt.getModelRegistry().get(key);
|
||||
evt.getModelRegistry().put(key, new GunModel(originalModel));
|
||||
|
||||
key = new ModelResourceLocation("botania:managunclip", "inventory");
|
||||
/* todo 1.13 models referenced using overrides aren't put in the model registry?
|
||||
key = new ModelResourceLocation("botania:mana_gun_clip", "inventory");
|
||||
originalModel = evt.getModelRegistry().get(key);
|
||||
evt.getModelRegistry().put(key, new GunModel(originalModel));
|
||||
*/
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -150,8 +154,8 @@ public class MiscellaneousIcons {
|
||||
for(int i = 0; i < 3; i++)
|
||||
register(evt.getMap(), "items/third_eye_" + i);
|
||||
|
||||
register(evt.getMap(), "items/triggers/manaDetector");
|
||||
register(evt.getMap(), "items/triggers/runeAltarCanCraft");
|
||||
register(evt.getMap(), "items/triggers/mana_detector");
|
||||
register(evt.getMap(), "items/triggers/rune_altar_can_craft");
|
||||
|
||||
/*
|
||||
for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) {
|
||||
@@ -163,7 +167,7 @@ public class MiscellaneousIcons {
|
||||
register(evt.getMap(), "items/headpiece_tiara_wing_" + (i + 1));
|
||||
}
|
||||
|
||||
register(evt.getMap(), "items/willFlame");
|
||||
register(evt.getMap(), "items/will_flame");
|
||||
|
||||
register(evt.getMap(), "items/pendant_blood_chain");
|
||||
register(evt.getMap(), "items/pendant_blood_gem");
|
||||
@@ -208,8 +212,8 @@ public class MiscellaneousIcons {
|
||||
for(int i = 0; i < 3; i++)
|
||||
thirdEyeLayers[i] = get(evt.getMap(), "items/third_eye_" + i);
|
||||
|
||||
manaDetectorIcon = get(evt.getMap(), "items/triggers/manaDetector");
|
||||
runeAltarTriggerIcon = get(evt.getMap(), "items/triggers/runeAltarCanCraft");
|
||||
manaDetectorIcon = get(evt.getMap(), "items/triggers/mana_detector");
|
||||
runeAltarTriggerIcon = get(evt.getMap(), "items/triggers/rune_altar_can_craft");
|
||||
|
||||
/*
|
||||
for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) {
|
||||
@@ -221,7 +225,7 @@ public class MiscellaneousIcons {
|
||||
tiaraWingIcons[i] = get(evt.getMap(), "items/headpiece_tiara_wing_" + (i + 1));
|
||||
}
|
||||
|
||||
terrasteelHelmWillIcon = get(evt.getMap(), "items/willFlame");
|
||||
terrasteelHelmWillIcon = get(evt.getMap(), "items/will_flame");
|
||||
|
||||
bloodPendantChain = get(evt.getMap(), "items/pendant_blood_chain");
|
||||
bloodPendantGem = get(evt.getMap(), "items/pendant_blood_gem");
|
||||
|
||||
@@ -143,16 +143,16 @@ public final class ModelHandler {
|
||||
}
|
||||
|
||||
private static void registerSubtiles() {
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:miniIsland", "variant=grass"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:miniIsland", "variant=podzol"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:miniIsland", "variant=mycel"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:miniIsland", "variant=snow"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:miniIsland", "variant=dry"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:miniIsland", "variant=golden"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:miniIsland", "variant=vivid"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:miniIsland", "variant=scorched"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:miniIsland", "variant=infused"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:miniIsland", "variant=mutated"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:mini_island", "variant=grass"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:mini_island", "variant=podzol"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:mini_island", "variant=mycel"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:mini_island", "variant=snow"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:mini_island", "variant=dry"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:mini_island", "variant=golden"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:mini_island", "variant=vivid"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:mini_island", "variant=scorched"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:mini_island", "variant=infused"));
|
||||
BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:mini_island", "variant=mutated"));
|
||||
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MANASTAR.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation(LibBlockNames.SUBTILE_PUREDAISY.toString()));
|
||||
@@ -172,7 +172,7 @@ public final class ModelHandler {
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileShulkMeNot.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SHULK_ME_NOT.toString()));
|
||||
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DREADTHORN.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HEISEI_DREAM.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TIGERSEYE.toString()));
|
||||
@@ -182,28 +182,28 @@ public final class ModelHandler {
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation(LibBlockNames.SUBTILE_FALLEN_KANADE.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation(LibBlockNames.SUBTILE_EXOFLAME.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TANGLEBERRIE.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_JIYUULIA.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HYACIDUS.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation(LibBlockNames.SUBTILE_POLLIDISIAC.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation(LibBlockNames.SUBTILE_LOONIUM.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DAFFOMILL.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_VINCULOTUS.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SPECTRANTHEMUM.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MEDUMONE.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA.toString()));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA + "_chibi"));
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BERGAMUTE.toString()));
|
||||
}
|
||||
|
||||
|
||||
@@ -154,9 +154,6 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE);
|
||||
|
||||
ColorHandler.init();
|
||||
initAuxiliaryRender();
|
||||
|
||||
ModChallenges.init();
|
||||
|
||||
if(ConfigHandler.CLIENT.boundBlockWireframe.get())
|
||||
@@ -179,6 +176,10 @@ public class ClientProxy implements IProxy {
|
||||
}
|
||||
|
||||
private void loadComplete(FMLLoadCompleteEvent event) {
|
||||
DeferredWorkQueue.runLater(() -> {
|
||||
initAuxiliaryRender();
|
||||
ColorHandler.init();
|
||||
});
|
||||
CorporeaAutoCompleteHandler.updateItemList();
|
||||
}
|
||||
|
||||
|
||||
@@ -26,43 +26,43 @@ public final class LibResources {
|
||||
public static final String PREFIX_OBJ_MODEL = PREFIX_MOD + "model/";
|
||||
public static final String PREFIX_CATEGORIES = PREFIX_GUI + "categories/";
|
||||
|
||||
public static final String EMTPY_TEXTURE = "emptyTexture";
|
||||
public static final String EMTPY_TEXTURE = "empty_texture";
|
||||
|
||||
public static final String GUI_MANA_HUD = PREFIX_GUI + "manaHud.png";
|
||||
public static final String GUI_MANA_HUD = PREFIX_GUI + "mana_hud.png";
|
||||
public static final String GUI_LEXICON = PREFIX_GUI + "lexicon.png";
|
||||
public static final String GUI_PAPER = PREFIX_GUI + "paper.png";
|
||||
public static final String GUI_CRAFTING_OVERLAY = PREFIX_GUI + "craftingOverlay.png";
|
||||
public static final String GUI_MANA_INFUSION_OVERLAY = PREFIX_GUI + "manaInfusionOverlay.png";
|
||||
public static final String GUI_PURE_DAISY_OVERLAY = PREFIX_GUI + "pureDaisyOverlay.png";
|
||||
public static final String GUI_PETAL_OVERLAY = PREFIX_GUI + "petalOverlay.png";
|
||||
public static final String GUI_TERRASTEEL_OVERLAY = PREFIX_GUI + "terrasteelOverlay.png";
|
||||
public static final String GUI_ELVEN_TRADE_OVERLAY = PREFIX_GUI + "elvenTradeOverlay.png";
|
||||
public static final String GUI_SHEDDING_OVERLAY = PREFIX_GUI + "sheddingOverlay.png";
|
||||
public static final String GUI_MULTIBLOCK_OVERLAY = PREFIX_GUI + "multiblockOverlay.png";
|
||||
public static final String GUI_CRAFTING_OVERLAY = PREFIX_GUI + "crafting_overlay.png";
|
||||
public static final String GUI_MANA_INFUSION_OVERLAY = PREFIX_GUI + "mana_infusion_overlay.png";
|
||||
public static final String GUI_PURE_DAISY_OVERLAY = PREFIX_GUI + "pure_daisy_overlay.png";
|
||||
public static final String GUI_PETAL_OVERLAY = PREFIX_GUI + "petal_overlay.png";
|
||||
public static final String GUI_TERRASTEEL_OVERLAY = PREFIX_GUI + "terrasteel_overlay.png";
|
||||
public static final String GUI_ELVEN_TRADE_OVERLAY = PREFIX_GUI + "elven_trade_overlay.png";
|
||||
public static final String GUI_SHEDDING_OVERLAY = PREFIX_GUI + "shedding_overlay.png";
|
||||
public static final String GUI_MULTIBLOCK_OVERLAY = PREFIX_GUI + "multiblock_overlay.png";
|
||||
public static final String GUI_CREATIVE = "botania.png";
|
||||
public static final String GUI_TOFF = PREFIX_GUI + "toff.png";
|
||||
public static final String GUI_BOSS_BAR = PREFIX_GUI + "bossBar.png";
|
||||
public static final String GUI_BOSS_BAR = PREFIX_GUI + "boss_bar.png";
|
||||
public static final String GUI_POTIONS = PREFIX_GUI + "potions.png";
|
||||
public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png";
|
||||
public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png";
|
||||
public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png";
|
||||
public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png";
|
||||
public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png";
|
||||
public static final String GUI_NEI_BLANK = PREFIX_GUI + "nei_blank.png";
|
||||
public static final String GUI_NEI_BREWERY = PREFIX_GUI + "nei_brewery.png";
|
||||
public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flower_bag.png";
|
||||
public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "bauble_box.png";
|
||||
public static final String GUI_HUD_ICONS = PREFIX_GUI + "hud_icons.png";
|
||||
public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png";
|
||||
public static final String GUI_DOG = PREFIX_GUI + "dog.png";
|
||||
public static final String GUI_FLOWEY = PREFIX_GUI + "flowey.png";
|
||||
|
||||
public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png";
|
||||
public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png";
|
||||
public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png";
|
||||
public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pure_daisy.png";
|
||||
public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png";
|
||||
public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png";
|
||||
public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elvenGarde.png";
|
||||
public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishingReturns.png";
|
||||
public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elven_garde.png";
|
||||
public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishing_returns.png";
|
||||
public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png";
|
||||
public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craftCrate.png";
|
||||
public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craft_crate.png";
|
||||
public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png";
|
||||
public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png";
|
||||
public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphic_stones.png";
|
||||
public static final String ENTRY_BANNERS = PREFIX_ENTRIES + "banners.png";
|
||||
|
||||
public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader_mana.png";
|
||||
@@ -115,8 +115,8 @@ public final class LibResources {
|
||||
public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png";
|
||||
public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png";
|
||||
public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teru_teru_bozu.png";
|
||||
public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teru_teru_bozu_halloween.png";
|
||||
public static final String MODEL_AVATAR = PREFIX_MODEL + "avatar.png";
|
||||
public static final String MODEL_AVATAR_DIVINING = PREFIX_MODEL + "avatar_divining.png";
|
||||
public static final String MODEL_AVATAR_FIRE = PREFIX_MODEL + "avatar_fire.png";
|
||||
|
||||
@@ -154,7 +154,7 @@ public class Botania {
|
||||
ModElvenTradeRecipes.init();
|
||||
ModBrewRecipes.init();
|
||||
ModCraftingRecipes.init();
|
||||
LexiconData.init();
|
||||
// todo 1.13 LexiconData.init();
|
||||
|
||||
if(Botania.thaumcraftLoaded) {
|
||||
if(ConfigHandler.COMMON.enableThaumcraftAspects.get()) {
|
||||
|
||||
@@ -329,7 +329,7 @@ public final class ModBlocks {
|
||||
@ObjectHolder("red" + LibBlockNames.MUSHROOM_SUFFIX) public static Block redMushroom;
|
||||
@ObjectHolder("black" + LibBlockNames.MUSHROOM_SUFFIX) public static Block blackMushroom;
|
||||
@ObjectHolder(LibBlockNames.PUMP) public static Block pump;
|
||||
@ObjectHolder("white" + LibBlockNames.MUSHROOM_SUFFIX) public static Block doubleFlowerWhite;
|
||||
@ObjectHolder("white" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerWhite;
|
||||
@ObjectHolder("orange" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerOrange;
|
||||
@ObjectHolder("magenta" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerMagenta;
|
||||
@ObjectHolder("light_blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerLightBlue;
|
||||
@@ -511,7 +511,7 @@ public final class ModBlocks {
|
||||
|
||||
builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE);
|
||||
ILexiconable azulejo = (w, po ,pl, st) -> LexiconData.azulejo;
|
||||
for (int i = 0; i < 15; i++) {
|
||||
for (int i = 0; i < 16; i++) {
|
||||
register(r, new BlockModLexiconable(builder, azulejo), LibBlockNames.AZULEJO_PREFIX + i);
|
||||
}
|
||||
|
||||
@@ -593,9 +593,6 @@ public final class ModBlocks {
|
||||
}
|
||||
|
||||
register(r, new BlockAnimatedTorch(Block.Properties.create(Material.CIRCUITS).lightValue(7)), LibBlockNames.ANIMATED_TORCH);
|
||||
|
||||
RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState();
|
||||
RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -949,7 +946,7 @@ public final class ModBlocks {
|
||||
|
||||
for(Class innerClazz : clazz.getDeclaredClasses())
|
||||
if(innerClazz.getSimpleName().equals("Mini"))
|
||||
BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "Chibi"), innerClazz, key);
|
||||
BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "_chibi"), innerClazz, key);
|
||||
}
|
||||
|
||||
public static Block getFlower(EnumDyeColor color) {
|
||||
|
||||
@@ -70,7 +70,7 @@ public class BlockBuriedPetals extends BlockModFlower {
|
||||
@Nonnull
|
||||
@Override
|
||||
public Item getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) {
|
||||
return ModItems.petals.get(color);
|
||||
return ModItems.getPetal(color);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -58,9 +58,11 @@ public final class BotaniaCreativeTab extends ItemGroup {
|
||||
for(EnumDyeColor color : EnumDyeColor.values())
|
||||
addItem(ModBlocks.getFlower(color));
|
||||
addItem(ModBlocks.specialFlower);
|
||||
ModItems.petals.values().forEach(this::addItem);
|
||||
for(EnumDyeColor color : EnumDyeColor.values())
|
||||
this.addItem(ModItems.getPetal(color));
|
||||
addItem(ModItems.pestleAndMortar);
|
||||
ModItems.dyes.values().forEach(this::addItem);
|
||||
for(EnumDyeColor color : EnumDyeColor.values())
|
||||
this.addItem(ModItems.getDye(color));
|
||||
addItem(ModItems.fertilizer);
|
||||
addItem(ModItems.flowerBag);
|
||||
addItem(ModItems.blackLotus);
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
@@ -26,7 +27,9 @@ import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public final class ModManaInfusionRecipes {
|
||||
|
||||
@@ -63,8 +66,9 @@ public final class ModManaInfusionRecipes {
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.REDSTONE), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.GLOWSTONE_DUST), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.SUGAR), 500));
|
||||
for(Item dye : ModItems.dyes.values())
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(dye), 400));
|
||||
List<Item> dyes = Arrays.stream(EnumDyeColor.values()).map(ModItems::getDye).collect(Collectors.toList());
|
||||
Ingredient dyeIngredient = Ingredient.fromItems(dyes.toArray(new Item[0]));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), dyeIngredient, 400));
|
||||
|
||||
pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), Ingredient.fromItems(Blocks.PISTON), 15000);
|
||||
manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), Ingredient.fromItems(Items.COOKIE), 20000);
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
@@ -18,13 +20,14 @@ import vazkii.botania.common.lib.LibOreDict;
|
||||
public final class ModPureDaisyRecipes {
|
||||
|
||||
public static void init() {
|
||||
BotaniaAPI.registerPureDaisyRecipe("stone", ModBlocks.livingrock.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe("logWood", ModBlocks.livingwood.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Tags.Blocks.STONE, ModBlocks.livingrock.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(BlockTags.LOGS, ModBlocks.livingwood.getDefaultState());
|
||||
|
||||
BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.COBBLESTONE.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.SAND.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.PACKED_ICE.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.OBSIDIAN.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Blocks.NETHERRACK, Blocks.COBBLESTONE.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Blocks.SOUL_SAND, Blocks.SAND.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Blocks.ICE, Blocks.PACKED_ICE.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Blocks.PACKED_ICE, Blocks.BLUE_ICE.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(ModBlocks.blazeBlock, Blocks.OBSIDIAN.getDefaultState());
|
||||
BotaniaAPI.registerPureDaisyRecipe(Blocks.WATER, Blocks.SNOW.getDefaultState());
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraftforge.event.RegistryEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.item.IFloatingFlower;
|
||||
import vazkii.botania.api.mana.spark.SparkUpgradeType;
|
||||
import vazkii.botania.api.item.IAncientWillContainer;
|
||||
@@ -90,23 +91,52 @@ import vazkii.botania.common.item.rod.ItemSmeltRod;
|
||||
import vazkii.botania.common.item.rod.ItemTerraformRod;
|
||||
import vazkii.botania.common.item.rod.ItemTornadoRod;
|
||||
import vazkii.botania.common.item.rod.ItemWaterRod;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import static vazkii.botania.common.block.ModBlocks.register;
|
||||
|
||||
// todo 1.13 objectholder ify everything
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
|
||||
public final class ModItems {
|
||||
public static final Item lexicon = new ItemLexicon(unstackable());
|
||||
public static final Map<EnumDyeColor, Item> petals = new EnumMap<>(EnumDyeColor.class);
|
||||
public static final Map<EnumDyeColor, Item> dyes = new EnumMap<>(EnumDyeColor.class);
|
||||
static {
|
||||
for(EnumDyeColor color : EnumDyeColor.values()) {
|
||||
petals.put(color, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder()));
|
||||
dyes.put(color, new ItemDye(color, defaultBuilder()));
|
||||
}
|
||||
}
|
||||
@ObjectHolder("botania:" + LibItemNames.LEXICON) public static Item lexicon;
|
||||
@ObjectHolder("botania:" + "white" + LibItemNames.PETAL_SUFFIX) public static Item whitePetal;
|
||||
@ObjectHolder("botania:" + "orange" + LibItemNames.PETAL_SUFFIX) public static Item orangePetal;
|
||||
@ObjectHolder("botania:" + "magenta" + LibItemNames.PETAL_SUFFIX) public static Item magentaPetal;
|
||||
@ObjectHolder("botania:" + "light_blue" + LibItemNames.PETAL_SUFFIX) public static Item lightBluePetal;
|
||||
@ObjectHolder("botania:" + "yellow" + LibItemNames.PETAL_SUFFIX) public static Item yellowPetal;
|
||||
@ObjectHolder("botania:" + "lime" + LibItemNames.PETAL_SUFFIX) public static Item limePetal;
|
||||
@ObjectHolder("botania:" + "pink" + LibItemNames.PETAL_SUFFIX) public static Item pinkPetal;
|
||||
@ObjectHolder("botania:" + "gray" + LibItemNames.PETAL_SUFFIX) public static Item grayPetal;
|
||||
@ObjectHolder("botania:" + "light_gray" + LibItemNames.PETAL_SUFFIX) public static Item lightGrayPetal;
|
||||
@ObjectHolder("botania:" + "cyan" + LibItemNames.PETAL_SUFFIX) public static Item cyanPetal;
|
||||
@ObjectHolder("botania:" + "purple" + LibItemNames.PETAL_SUFFIX) public static Item purplePetal;
|
||||
@ObjectHolder("botania:" + "blue" + LibItemNames.PETAL_SUFFIX) public static Item bluePetal;
|
||||
@ObjectHolder("botania:" + "brown" + LibItemNames.PETAL_SUFFIX) public static Item brownPetal;
|
||||
@ObjectHolder("botania:" + "green" + LibItemNames.PETAL_SUFFIX) public static Item greenPetal;
|
||||
@ObjectHolder("botania:" + "red" + LibItemNames.PETAL_SUFFIX) public static Item redPetal;
|
||||
@ObjectHolder("botania:" + "black" + LibItemNames.PETAL_SUFFIX) public static Item blackPetal;
|
||||
|
||||
@ObjectHolder("botania:" + "white" + LibItemNames.DYE_SUFFIX) public static Item whiteDye;
|
||||
@ObjectHolder("botania:" + "orange" + LibItemNames.DYE_SUFFIX) public static Item orangeDye;
|
||||
@ObjectHolder("botania:" + "magenta" + LibItemNames.DYE_SUFFIX) public static Item magentaDye;
|
||||
@ObjectHolder("botania:" + "light_blue" + LibItemNames.DYE_SUFFIX) public static Item lightBlueDye;
|
||||
@ObjectHolder("botania:" + "yellow" + LibItemNames.DYE_SUFFIX) public static Item yellowDye;
|
||||
@ObjectHolder("botania:" + "lime" + LibItemNames.DYE_SUFFIX) public static Item limeDye;
|
||||
@ObjectHolder("botania:" + "pink" + LibItemNames.DYE_SUFFIX) public static Item pinkDye;
|
||||
@ObjectHolder("botania:" + "gray" + LibItemNames.DYE_SUFFIX) public static Item grayDye;
|
||||
@ObjectHolder("botania:" + "light_gray" + LibItemNames.DYE_SUFFIX) public static Item lightGrayDye;
|
||||
@ObjectHolder("botania:" + "cyan" + LibItemNames.DYE_SUFFIX) public static Item cyanDye;
|
||||
@ObjectHolder("botania:" + "purple" + LibItemNames.DYE_SUFFIX) public static Item purpleDye;
|
||||
@ObjectHolder("botania:" + "blue" + LibItemNames.DYE_SUFFIX) public static Item blueDye;
|
||||
@ObjectHolder("botania:" + "brown" + LibItemNames.DYE_SUFFIX) public static Item brownDye;
|
||||
@ObjectHolder("botania:" + "green" + LibItemNames.DYE_SUFFIX) public static Item greenDye;
|
||||
@ObjectHolder("botania:" + "red" + LibItemNames.DYE_SUFFIX) public static Item redDye;
|
||||
@ObjectHolder("botania:" + "black" + LibItemNames.DYE_SUFFIX) public static Item blackDye;
|
||||
|
||||
public static final Item pestleAndMortar = new ItemSelfReturning(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PESTLE_AND_MORTAR);
|
||||
public static final Item twigWand = new ItemTwigWand(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TWIG_WAND);
|
||||
@@ -183,15 +213,15 @@ public final class ModItems {
|
||||
public static final Item manaCookie = new ItemManaCookie(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE);
|
||||
public static final Item fertilizer = new ItemFertilizer(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FERTILIZER);
|
||||
|
||||
public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder());
|
||||
public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder());
|
||||
public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder());
|
||||
public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder());
|
||||
public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder());
|
||||
public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder());
|
||||
public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder());
|
||||
public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder());
|
||||
public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder());
|
||||
public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS);
|
||||
public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PODZOL_SEEDS);
|
||||
public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MYCEL_SEEDS);
|
||||
public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DRY_SEEDS);
|
||||
public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GOLDEN_SEEDS);
|
||||
public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.VIVID_SEEDS);
|
||||
public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SCORCHED_SEEDS);
|
||||
public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INFUSED_SEEDS);
|
||||
public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MUTATED_SEEDS);
|
||||
|
||||
public static final Item dirtRod = new ItemDirtRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIRT_ROD);
|
||||
public static final Item terraformRod = new ItemTerraformRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRAFORM_ROD);
|
||||
@@ -230,7 +260,7 @@ public final class ModItems {
|
||||
public static final Item terraPick = new ItemTerraPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_PICK);
|
||||
public static final Item divaCharm = new ItemDivaCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIVA_CHARM);
|
||||
public static final Item flightTiara = new ItemFlightTiara(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLIGHT_TIARA);
|
||||
public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()); // What you looking at?
|
||||
public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ENDER_DAGGER); // What you looking at?
|
||||
public static final Item darkQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[0]);
|
||||
public static final Item manaQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[1]);
|
||||
public static final Item blazeQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[2]);
|
||||
@@ -354,7 +384,7 @@ public final class ModItems {
|
||||
public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS);
|
||||
public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS);
|
||||
public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO);
|
||||
public static final Item gaiaHead = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new));
|
||||
@ObjectHolder("botania:" + LibBlockNames.GAIA_HEAD) public static Item gaiaHead;
|
||||
public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT);
|
||||
public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT);
|
||||
public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX);
|
||||
@@ -363,8 +393,8 @@ public final class ModItems {
|
||||
public static final Item cloudPendant = new ItemCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CLOUD_PENDANT);
|
||||
public static final Item superCloudPendant = new ItemSuperCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SUPER_CLOUD_PENDANT);
|
||||
public static final Item thirdEye = new ItemThirdEye(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THIRD_EYE);
|
||||
public static final Item astrolabe = new ItemAstrolabe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ASTROLABE);
|
||||
public static final Item goddessCharm = new ItemGoddessCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GODDESS_CHARM);
|
||||
@ObjectHolder("botania:" + LibItemNames.ASTROLABE) public static Item astrolabe;
|
||||
@ObjectHolder("botania:" + LibItemNames.GODDESS_CHARM) public static Item goddessCharm;
|
||||
|
||||
public static Item.Properties defaultBuilder() {
|
||||
return new Item.Properties().group(BotaniaCreativeTab.INSTANCE);
|
||||
@@ -378,9 +408,11 @@ public final class ModItems {
|
||||
public static void registerItems(RegistryEvent.Register<Item> evt) {
|
||||
IForgeRegistry<Item> r = evt.getRegistry();
|
||||
|
||||
r.register(lexicon);
|
||||
petals.values().forEach(r::register);
|
||||
dyes.values().forEach(r::register);
|
||||
register(r, new ItemLexicon(unstackable()), LibItemNames.LEXICON);
|
||||
for(EnumDyeColor color : EnumDyeColor.values()) {
|
||||
register(r, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder()), color.getName() + LibItemNames.PETAL_SUFFIX);
|
||||
register(r, new ItemDye(color, defaultBuilder()), color.getName() + LibItemNames.DYE_SUFFIX);
|
||||
}
|
||||
r.register(pestleAndMortar);
|
||||
r.register(twigWand);
|
||||
r.register(manaSteel);
|
||||
@@ -616,7 +648,8 @@ public final class ModItems {
|
||||
r.register(manaweaveLegs);
|
||||
r.register(manaweaveBoots);
|
||||
r.register(autocraftingHalo);
|
||||
r.register(gaiaHead);
|
||||
Item head = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new));
|
||||
r.register(head.setRegistryName(ModBlocks.gaiaHead.getRegistryName()));
|
||||
r.register(sextant);
|
||||
r.register(speedUpBelt);
|
||||
r.register(baubleBox);
|
||||
@@ -625,8 +658,8 @@ public final class ModItems {
|
||||
r.register(cloudPendant);
|
||||
r.register(superCloudPendant);
|
||||
r.register(thirdEye);
|
||||
r.register(astrolabe);
|
||||
r.register(goddessCharm);
|
||||
register(r, new ItemAstrolabe(unstackable()), LibItemNames.ASTROLABE);
|
||||
register(r, new ItemGoddessCharm(unstackable()), LibItemNames.GODDESS_CHARM);
|
||||
|
||||
registerOreDictionary();
|
||||
}
|
||||
@@ -654,4 +687,48 @@ public final class ModItems {
|
||||
OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock);
|
||||
*/
|
||||
}
|
||||
|
||||
public static Item getPetal(EnumDyeColor color) {
|
||||
switch (color) {
|
||||
default:
|
||||
case WHITE: return whitePetal;
|
||||
case ORANGE: return orangePetal;
|
||||
case MAGENTA: return magentaPetal;
|
||||
case LIGHT_BLUE: return lightBluePetal;
|
||||
case YELLOW: return yellowPetal;
|
||||
case LIME: return limePetal;
|
||||
case PINK: return pinkPetal;
|
||||
case GRAY: return grayPetal;
|
||||
case LIGHT_GRAY: return lightGrayPetal;
|
||||
case CYAN: return cyanPetal;
|
||||
case PURPLE: return purplePetal;
|
||||
case BLUE: return bluePetal;
|
||||
case BROWN: return brownPetal;
|
||||
case GREEN: return greenPetal;
|
||||
case RED: return redPetal;
|
||||
case BLACK: return blackPetal;
|
||||
}
|
||||
}
|
||||
|
||||
public static Item getDye(EnumDyeColor color) {
|
||||
switch (color) {
|
||||
default:
|
||||
case WHITE: return whiteDye;
|
||||
case ORANGE: return orangeDye;
|
||||
case MAGENTA: return magentaDye;
|
||||
case LIGHT_BLUE: return lightBlueDye;
|
||||
case YELLOW: return yellowDye;
|
||||
case LIME: return limeDye;
|
||||
case PINK: return pinkDye;
|
||||
case GRAY: return grayDye;
|
||||
case LIGHT_GRAY: return lightGrayDye;
|
||||
case CYAN: return cyanDye;
|
||||
case PURPLE: return purpleDye;
|
||||
case BLUE: return blueDye;
|
||||
case BROWN: return brownDye;
|
||||
case GREEN: return greenDye;
|
||||
case RED: return redDye;
|
||||
case BLACK: return blackDye;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower {
|
||||
@Nonnull
|
||||
@Override
|
||||
public ITextComponent getDisplayName(@Nonnull ItemStack stack) {
|
||||
ITextComponent flowerName = stack.getDisplayName();
|
||||
ITextComponent flowerName = super.getDisplayName(stack);
|
||||
return new TextComponentTranslation("botaniamisc.floatingPrefix").appendSibling(flowerName);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,12 +30,15 @@ import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public class ItemOdinRing extends ItemRelicBauble {
|
||||
|
||||
private static final List<String> damageNegations = new ArrayList<>();
|
||||
private static final Set<String> damageNegations = new HashSet<>();
|
||||
private static final Set<String> fireNegations = new HashSet<>();
|
||||
|
||||
public ItemOdinRing(Properties props) {
|
||||
super(props);
|
||||
@@ -43,13 +46,10 @@ public class ItemOdinRing extends ItemRelicBauble {
|
||||
damageNegations.add(DamageSource.DROWN.damageType);
|
||||
damageNegations.add(DamageSource.FALL.damageType);
|
||||
damageNegations.add(DamageSource.LAVA.damageType);
|
||||
if(ConfigHandler.COMMON.ringOfOdinFireResist.get()) {
|
||||
damageNegations.add(DamageSource.IN_FIRE.damageType);
|
||||
damageNegations.add(DamageSource.ON_FIRE.damageType);
|
||||
}
|
||||
|
||||
damageNegations.add(DamageSource.IN_WALL.damageType);
|
||||
damageNegations.add(DamageSource.STARVE.damageType);
|
||||
fireNegations.add(DamageSource.IN_FIRE.damageType);
|
||||
fireNegations.add(DamageSource.ON_FIRE.damageType);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,7 +62,9 @@ public class ItemOdinRing extends ItemRelicBauble {
|
||||
public static void onPlayerAttacked(LivingAttackEvent event) {
|
||||
if(event.getEntityLiving() instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
|
||||
if(!getOdinRing(player).isEmpty() && damageNegations.contains(event.getSource().damageType))
|
||||
boolean negate = damageNegations.contains(event.getSource().damageType)
|
||||
|| (ConfigHandler.COMMON.ringOfOdinFireResist.get() && fireNegations.contains(event.getSource().damageType));
|
||||
if(!getOdinRing(player).isEmpty() && negate)
|
||||
event.setCanceled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -537,7 +537,7 @@ public final class LexiconData {
|
||||
flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers);
|
||||
flowerShrinking.setPriority()
|
||||
.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes))
|
||||
.setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "Chibi")));
|
||||
.setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi")));
|
||||
|
||||
flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers);
|
||||
flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1"));
|
||||
|
||||
@@ -146,7 +146,6 @@ public final class LibBlockNames {
|
||||
public static final ResourceLocation SUBTILE_ENDOFLAME = prefix("endoflame");
|
||||
public static final ResourceLocation SUBTILE_HYDROANGEAS = prefix("hydroangeas");
|
||||
public static final ResourceLocation SUBTILE_THERMALILY = prefix("thermalily");
|
||||
public static final ResourceLocation SUBTILE_NIGHTSHADE_PRIME = prefix("nightshadePrime");
|
||||
public static final ResourceLocation SUBTILE_ARCANE_ROSE = prefix("arcanerose");
|
||||
public static final ResourceLocation SUBTILE_MUNCHDEW = prefix("munchdew");
|
||||
public static final ResourceLocation SUBTILE_ENTROPINNYUM = prefix("entropinnyum");
|
||||
@@ -161,11 +160,11 @@ public final class LibBlockNames {
|
||||
public static final ResourceLocation SUBTILE_BELLETHORN = prefix("bellethorn");
|
||||
public static final ResourceLocation SUBTILE_BERGAMUTE = prefix("bergamute");
|
||||
public static final ResourceLocation SUBTILE_DREADTHORN = prefix("dreadthorn");
|
||||
public static final ResourceLocation SUBTILE_HEISEI_DREAM = prefix("heiseiDream");
|
||||
public static final ResourceLocation SUBTILE_HEISEI_DREAM = prefix("heisei_dream");
|
||||
public static final ResourceLocation SUBTILE_TIGERSEYE = prefix("tigerseye");
|
||||
public static final ResourceLocation SUBTILE_JADED_AMARANTHUS = prefix("jadedAmaranthus");
|
||||
public static final ResourceLocation SUBTILE_JADED_AMARANTHUS = prefix("jaded_amaranthus");
|
||||
public static final ResourceLocation SUBTILE_ORECHID = prefix("orechid");
|
||||
public static final ResourceLocation SUBTILE_FALLEN_KANADE = prefix("fallenKanade");
|
||||
public static final ResourceLocation SUBTILE_FALLEN_KANADE = prefix("fallen_kanade");
|
||||
public static final ResourceLocation SUBTILE_EXOFLAME = prefix("exoflame");
|
||||
public static final ResourceLocation SUBTILE_AGRICARNATION = prefix("agricarnation");
|
||||
public static final ResourceLocation SUBTILE_HOPPERHOCK = prefix("hopperhock");
|
||||
@@ -183,7 +182,7 @@ public final class LibBlockNames {
|
||||
public static final ResourceLocation SUBTILE_MARIMORPHOSIS = prefix("marimorphosis");
|
||||
public static final ResourceLocation SUBTILE_BUBBELL = prefix("bubbell");
|
||||
public static final ResourceLocation SUBTILE_SOLEGNOLIA = prefix("solegnolia");
|
||||
public static final ResourceLocation SUBTILE_ORECHID_IGNEM = prefix("orechidIgnem");
|
||||
public static final ResourceLocation SUBTILE_ORECHID_IGNEM = prefix("orechid_ignem");
|
||||
|
||||
public static final String QUARTZ_DARK = "dark_quartz";
|
||||
public static final String QUARTZ_MANA = "mana_quartz";
|
||||
|
||||
@@ -30,6 +30,14 @@ public final class LibItemNames {
|
||||
public static final String MANA_COOKIE = "mana_cookie";
|
||||
public static final String FERTILIZER = "fertilizer";
|
||||
public static final String GRASS_SEEDS = "seeds";
|
||||
public static final String PODZOL_SEEDS = "podzol_seeds";
|
||||
public static final String MYCEL_SEEDS = "mycelium_seeds";
|
||||
public static final String DRY_SEEDS = "dry_seeds";
|
||||
public static final String GOLDEN_SEEDS = "golden_seeds";
|
||||
public static final String VIVID_SEEDS = "vivid_seeds";
|
||||
public static final String SCORCHED_SEEDS = "scorched_seeds";
|
||||
public static final String INFUSED_SEEDS = "infused_seeds";
|
||||
public static final String MUTATED_SEEDS = "mutated_seeds";
|
||||
public static final String DIRT_ROD = "dirt_rod";
|
||||
public static final String TERRAFORM_ROD = "terraform_rod";
|
||||
public static final String MANA_MIRROR = "mana_mirror";
|
||||
|
||||
Reference in new issue
Block a user