Other non-recipe misc fixes

This commit is contained in:
Vincent Lee committed 2017-06-25 00:25:15 -05:00
1 parent 1dd68f9558
commit acfa518f62
9 files changed
+13 -24

No files matched your search

@@ -20,7 +20,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
@@ -56,12 +55,12 @@ public class DummyMethodHandler implements IInternalMethodHandler {
}
@Override
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes) {
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage craftingRecipePage(String key, IRecipe recipe) {
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) {
return dummyPage(key);
}
@@ -19,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
@@ -54,9 +53,9 @@ public interface IInternalMethodHandler {
public LexiconPage imagePage(String key, String resource);
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes);
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes);
public LexiconPage craftingRecipePage(String key, IRecipe recipe);
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe);
public LexiconPage petalRecipesPage(String key, List<RecipePetals> recipes);
@@ -126,11 +126,7 @@ public class Botania {
ConfigHandler.loadConfig(event.getSuggestedConfigurationFile());
PacketHandler.init();
ModSounds.init();
ModBlocks.init();
ModItems.init();
ModEntities.init();
ModPotions.init();
ModBrews.init();
ModMultiblocks.init();
@@ -144,8 +140,6 @@ public class Botania {
@EventHandler
public void init(FMLInitializationEvent event) {
ModCraftingRecipes.init();
ModMigrationRecipes.init();
ModPetalRecipes.init();
ModPureDaisyRecipes.init();
ModRuneRecipes.init();
@@ -54,9 +54,6 @@ public class BlockFakeAir extends BlockMod {
return EnumBlockRenderType.INVISIBLE;
}
@Override
public void registerItemForm() {}
@Override
public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) {
if(shouldRemove(world, pos))
@@ -25,7 +25,6 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
@@ -93,12 +92,12 @@ public class InternalMethodHandler extends DummyMethodHandler {
}
@Override
public LexiconPage craftingRecipesPage(String key, List<IRecipe> recipes) {
public LexiconPage craftingRecipesPage(String key, List<ResourceLocation> recipes) {
return new PageCraftingRecipe(key, recipes);
}
@Override
public LexiconPage craftingRecipePage(String key, IRecipe recipe) {
public LexiconPage craftingRecipePage(String key, ResourceLocation recipe) {
return new PageCraftingRecipe(key, recipe);
}
@@ -12,7 +12,7 @@ public final class ModMigrationRecipes {
public static void init() {
// Prismarine -> vanilla
GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10));
// todo 1.12 json GameRegistry.addShapelessRecipe(new ItemStack(Items.PRISMARINE_SHARD), new ItemStack(ModItems.manaResource, 1, 10));
}
private ModMigrationRecipes() {}
@@ -149,7 +149,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd);
} else if(cooldown > 0) {
if(maxCd - cooldown < 2)
player.func_191958_b(0F, 0F, 1F, 5F); // todo 1.12 recheck
player.moveRelative(0F, 0F, 1F, 5F);
else if(maxCd - cooldown < 10)
player.setSprinting(false);
ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2);
@@ -81,7 +81,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs
if(player.world.isRemote) {
if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) {
float speed = beltItem.getSpeed(belt);
player.func_191958_b(0F, 0F, 1F, player.capabilities.isFlying ? speed : speed); // todo 1.12 verify
player.moveRelative(0F, 0F, 1F, player.capabilities.isFlying ? speed : speed);
beltItem.onMovedTick(belt, player);
if(player.ticksExisted % COST_INTERVAL == 0)
@@ -39,9 +39,10 @@ public class RelicLexiconEntry extends BasicLexiconEntry {
if(a == null || player.capabilities.isCreativeMode) {
return true;
} else {
Advancement a = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a);
AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(a);
return progress.isDone();
/*Advancement adv = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a);
AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(adv);
return progress.isDone();*/
return false; // todo 1.12
}
}