Update forge and fix compiles, and cleanup some recipes

This commit is contained in:
Vincent Lee committed 2017-06-27 21:26:48 -05:00
1 parent b29e95df81
commit 7feea17302
217 files changed
+282 -458

No files matched your search

@@ -10,7 +10,6 @@
*/
package vazkii.botania.client.core.handler;
import com.google.common.base.Optional;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
@@ -33,6 +32,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.lib.LibMisc;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
public final class DebugHandler {
@@ -86,7 +86,7 @@ public final class DebugHandler {
if (state instanceof IExtendedBlockState) {
try {
for (Map.Entry<IUnlistedProperty<?>, Optional<?>> e : ((IExtendedBlockState) state).getUnlistedProperties().entrySet()) {
event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orNull());
event.getRight().add(TextFormatting.LIGHT_PURPLE + e.getKey().getName() + ": " + TextFormatting.RESET + e.getValue().orElse(null));
}
} catch (Throwable t) {
event.getRight().add("Error getting extended state");
@@ -32,19 +32,8 @@ public class GuiFactory implements IModGuiFactory {
return new GuiBotaniaConfig(parentScreen);
}
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return null;
}
@Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
return null;
}
@Override
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
return null;
}
}
@@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
@@ -147,7 +146,7 @@ public class FloatingFlowerModel implements IBakedModel {
@Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/dirt"); }
@Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
private static class CompositeBakedModel implements IPerspectiveAwareModel {
private static class CompositeBakedModel implements IBakedModel {
private final IBakedModel flower;
private final IBakedModel island;
@@ -203,11 +202,9 @@ public class FloatingFlowerModel implements IBakedModel {
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
if(island instanceof IPerspectiveAwareModel) {
Pair<? extends IBakedModel, Matrix4f> pair = ((IPerspectiveAwareModel) island).handlePerspective(cameraTransformType);
if(pair != null && pair.getRight() != null)
return Pair.of(this, pair.getRight());
}
Pair<? extends IBakedModel, Matrix4f> pair = island.handlePerspective(cameraTransformType);
if(pair != null && pair.getRight() != null)
return Pair.of(this, pair.getRight());
return Pair.of(this, TRSRTransformation.identity().getMatrix());
}
}
@@ -15,7 +15,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
import net.minecraftforge.client.model.pipeline.VertexTransformer;
@@ -106,7 +105,7 @@ public class GunModel implements IBakedModel {
return builder.build();
}
private static class CompositeBakedModel implements IPerspectiveAwareModel {
private static class CompositeBakedModel implements IBakedModel {
private final IBakedModel gun;
private final List<BakedQuad> genQuads;
@@ -151,12 +150,10 @@ public class GunModel implements IBakedModel {
@Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; }
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
if(gun instanceof IPerspectiveAwareModel) {
Pair<? extends IBakedModel, Matrix4f> pair = ((IPerspectiveAwareModel) gun).handlePerspective(cameraTransformType);
if(pair != null && pair.getRight() != null)
return Pair.of(this, pair.getRight());
}
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) {
Pair<? extends IBakedModel, Matrix4f> pair = gun.handlePerspective(cameraTransformType);
if(pair != null && pair.getRight() != null)
return Pair.of(this, pair.getRight());
return Pair.of(this, TRSRTransformation.identity().getMatrix());
}
}
@@ -10,7 +10,6 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import org.apache.commons.lang3.tuple.Pair;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -19,7 +18,7 @@ import javax.vecmath.Matrix4f;
import java.util.List;
@SuppressWarnings("deprecation")
public class LexiconModel implements IPerspectiveAwareModel {
public class LexiconModel implements IBakedModel {
private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory");
@@ -30,7 +29,7 @@ public class LexiconModel implements IPerspectiveAwareModel {
|| cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND)
&& ConfigHandler.lexicon3dModel)
return Pair.of(this, null);
return ((IPerspectiveAwareModel) original).handlePerspective(cameraTransformType);
return original.handlePerspective(cameraTransformType);
}
@Nonnull @Override public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); }
@@ -10,7 +10,6 @@
*/
package vazkii.botania.client.model;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import net.minecraft.client.renderer.BufferBuilder;
@@ -37,6 +36,7 @@ import vazkii.botania.api.state.enums.PylonVariant;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
public class ModelPylon implements IPylonModel {
@@ -154,7 +154,7 @@ public class ModelPylon implements IPylonModel {
}
}
return Optional.absent();
return Optional.empty();
};
}
@@ -8,7 +8,6 @@
*/
package vazkii.botania.client.model;
import com.google.common.base.Function;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
@@ -36,10 +35,9 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ICustomModelLoader;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.IModelCustomData;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.PerspectiveMapWrapper;
import net.minecraftforge.client.model.SimpleModelState;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
@@ -58,8 +56,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
public class SpecialFlowerModel implements IModelCustomData {
public class SpecialFlowerModel implements IModel {
// SpecialFlowerModel for when there are no blockModels registered for a subtile
public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.of(), ImmutableMap.of());
@@ -93,7 +92,7 @@ public class SpecialFlowerModel implements IModelCustomData {
@Override
public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
// "Bake" the SpecialFlowerModel (in reality, just create another wrapper for all the delegate blockModels)
return new SpecialFlowerBakedModel(blockModels, itemModels, IPerspectiveAwareModel.MapWrapper.getTransforms(state));
return new SpecialFlowerBakedModel(blockModels, itemModels, PerspectiveMapWrapper.getTransforms(state));
}
@Override
@@ -157,7 +156,7 @@ public class SpecialFlowerModel implements IModelCustomData {
}
}
private static class SpecialFlowerBakedModel implements IPerspectiveAwareModel {
private static class SpecialFlowerBakedModel implements IBakedModel {
private final ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> transforms;
private final ImmutableMap<Optional<String>, ModelResourceLocation> blockModels;
@@ -277,7 +276,7 @@ public class SpecialFlowerModel implements IModelCustomData {
@Override
public Pair<? extends IBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
return IPerspectiveAwareModel.MapWrapper.handlePerspective(this, transforms, cameraTransformType);
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType);
}
}
@@ -70,7 +70,7 @@ public class ItemCacophonium extends ItemMod {
sound = ((EntitySlime) living).isSmallSlime() ? SoundEvents.ENTITY_SMALL_SLIME_SQUISH : SoundEvents.ENTITY_SLIME_SQUISH;
else {
try {
sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, living, LibObfuscation.GET_LIVING_SOUND).invoke(living);
sound = (SoundEvent) ReflectionHelper.findMethod(EntityLiving.class, LibObfuscation.GET_LIVING_SOUND[0], LibObfuscation.GET_LIVING_SOUND[1]).invoke(living);
} catch (InvocationTargetException | IllegalAccessException ignored) {
Botania.LOGGER.debug("Couldn't get living sound");
}
@@ -82,7 +82,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14)
return EntityDoppleganger.spawn(player, stack, world, pos, stack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL;
else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player)) {
else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player, hand)) {
if(!world.isRemote)
world.playEvent(2005, pos, 0);