mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Bump JEI, get things running
This commit is contained in:
1 parent
acfa518f62
commit
e0e5503fe8
10 files changed
+22
-14
No files matched your search
@@ -526,7 +526,7 @@ public final class BotaniaAPI {
|
||||
* Call this in preInit, and don't forget to register a model in BotaniaAPIClient.
|
||||
*/
|
||||
public static void registerSubTile(String key, Class<? extends SubTileEntity> subtileClass) {
|
||||
Preconditions.checkArgument(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
// todo 1.12 Preconditions.checkArgument(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
subTiles.put(key, subtileClass);
|
||||
subTileMods.put(key, Loader.instance().activeModContainer().getModId());
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public final class BotaniaAPIClient {
|
||||
* @param itemModel A path to a blockstate json and variant to be used for this subtile's item form
|
||||
*/
|
||||
public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) {
|
||||
Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
// todo 1.12 Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
subtileBlockModels.put(subTileName, model);
|
||||
subtileItemModels.put(subTileName, itemModel);
|
||||
}
|
||||
@@ -95,7 +95,7 @@ public final class BotaniaAPIClient {
|
||||
* @param model The variant within a blockstate json to use as the islandtype's model
|
||||
*/
|
||||
public static void registerIslandTypeModel(IFloatingFlower.IslandType islandType, ModelResourceLocation model) {
|
||||
Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
// todo 1.12 Preconditions.checkState(Loader.instance().isInState(LoaderState.PREINITIALIZATION));
|
||||
islandTypeModels.put(islandType, model);
|
||||
}
|
||||
|
||||
|
||||
@@ -18,9 +18,12 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
||||
import net.minecraft.client.renderer.block.statemap.IStateMapper;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.obj.OBJLoader;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
import net.minecraftforge.registries.IRegistryDelegate;
|
||||
import vazkii.botania.api.BotaniaAPIClient;
|
||||
@@ -70,9 +73,10 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@Mod.EventBusSubscriber
|
||||
public final class ModelHandler {
|
||||
|
||||
public static void registerModels() {
|
||||
@SubscribeEvent
|
||||
public static void registerModels(ModelRegistryEvent evt) {
|
||||
ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
|
||||
OBJLoader.INSTANCE.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT));
|
||||
|
||||
|
||||
@@ -204,7 +204,6 @@ public class ClientProxy implements IProxy {
|
||||
}
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE);
|
||||
ModelHandler.registerModels();
|
||||
initRenderers();
|
||||
}
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ public class Botania {
|
||||
ModManaInfusionRecipes.init();
|
||||
ModElvenTradeRecipes.init();
|
||||
ModBrewRecipes.init();
|
||||
LexiconData.init();
|
||||
// LexiconData.init(); todo 1.12
|
||||
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler());
|
||||
|
||||
@@ -186,7 +186,7 @@ public class Botania {
|
||||
|
||||
ModBlocks.addDispenserBehaviours();
|
||||
ConfigHandler.loadPostInit();
|
||||
LexiconData.postInit();
|
||||
// LexiconData.postInit(); todo 1.12
|
||||
|
||||
int words = 0;
|
||||
for(LexiconEntry entry : BotaniaAPI.getAllEntries())
|
||||
|
||||
@@ -439,7 +439,6 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(bifrostPerm).setRegistryName(bifrostPerm.getRegistryName()));
|
||||
r.register(new ItemBlockMod(cellBlock).setRegistryName(cellBlock.getRegistryName()));
|
||||
r.register(new ItemBlockMod(redStringInterceptor).setRegistryName(redStringInterceptor.getRegistryName()));
|
||||
r.register(new ItemGaiaHead().setRegistryName(gaiaHead.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaRetainer).setRegistryName(corporeaRetainer.getRegistryName()));
|
||||
r.register(new ItemBlockMod(teruTeruBozu).setRegistryName(teruTeruBozu.getRegistryName()));
|
||||
r.register(new ItemBlockMod(shimmerrock).setRegistryName(shimmerrock.getRegistryName()));
|
||||
|
||||
@@ -331,15 +331,15 @@ public final class ModFluffBlocks {
|
||||
r.register(new ItemBlockWithMetadataAndName(pavement).setRegistryName(pavement.getRegistryName()));
|
||||
|
||||
for (int i = 0; i < 24; i++) {
|
||||
r.register(new ItemBlockMod(biomeStoneStairs[i].setRegistryName(biomeStoneStairs[i].getRegistryName())));
|
||||
r.register(new ItemBlockModSlab(biomeStoneSlabs[i].setRegistryName(biomeStoneSlabs[i].getRegistryName())));
|
||||
r.register(new ItemBlockMod(biomeStoneStairs[i]).setRegistryName(biomeStoneStairs[i].getRegistryName()));
|
||||
r.register(new ItemBlockModSlab(biomeStoneSlabs[i]).setRegistryName(biomeStoneSlabs[i].getRegistryName()));
|
||||
}
|
||||
|
||||
r.register(new ItemBlockWithMetadataAndName(biomeStoneWall).setRegistryName(biomeStoneWall.getRegistryName()));
|
||||
|
||||
for (int i = 0; i < BlockPavement.TYPES; i++) {
|
||||
r.register(new ItemBlockMod(pavementStairs[i].setRegistryName(pavementStairs[i].getRegistryName())));
|
||||
r.register(new ItemBlockModSlab(pavementSlabs[i].setRegistryName(pavementSlabs[i].getRegistryName())));
|
||||
r.register(new ItemBlockMod(pavementStairs[i]).setRegistryName(pavementStairs[i].getRegistryName()));
|
||||
r.register(new ItemBlockModSlab(pavementSlabs[i]).setRegistryName(pavementSlabs[i].getRegistryName()));
|
||||
}
|
||||
|
||||
r.register(new ItemBlockModSlab(shimmerrockSlab).setRegistryName(shimmerrockSlab.getRegistryName()));
|
||||
|
||||
@@ -385,6 +385,7 @@ public final class ModCraftingRecipes {
|
||||
r.register(new TerraPickTippingRecipe().setRegistryName(new ResourceLocation(LibMisc.MOD_ID, "terra_pick_tipping")));
|
||||
RecipeSorter.register("botania:terraPickTipping", TerraPickTippingRecipe.class, RecipeSorter.Category.SHAPELESS, "");
|
||||
|
||||
/*
|
||||
int recipeListSize = CraftingManager.getInstance().getRecipeList().size();
|
||||
|
||||
// Lexicon Recipe
|
||||
@@ -2240,8 +2241,10 @@ public final class ModCraftingRecipes {
|
||||
|
||||
int newRecipeListSize = CraftingManager.getInstance().getRecipeList().size();
|
||||
Botania.LOGGER.info("Registered %d recipes.", newRecipeListSize - recipeListSize);
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
private static void initGardenOfGlass() {
|
||||
// Root to Sapling
|
||||
addShapelessOreDictRecipe(new ItemStack(Blocks.SAPLING), LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT, LibOreDict.ROOT);
|
||||
@@ -2328,4 +2331,5 @@ public final class ModCraftingRecipes {
|
||||
private static void addShapelessOreDictRecipe(ItemStack output, Object... recipe) {
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(output, recipe));
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -293,6 +293,7 @@ public final class LexiconData {
|
||||
public static LexiconEntry bcIntegration;
|
||||
public static LexiconEntry banners;
|
||||
|
||||
/*
|
||||
public static void init() {
|
||||
BotaniaAPI.addCategory(BotaniaAPI.categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS, 9));
|
||||
BotaniaAPI.addCategory(BotaniaAPI.categoryMana = new BLexiconCategory(LibLexicon.CATEGORY_MANA, 5));
|
||||
@@ -1440,4 +1441,5 @@ public final class LexiconData {
|
||||
.setIcon(new ItemStack(ModItems.manaInkwell));
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
Reference in new issue
Block a user