update gradle, apply migration mappings, start fixing stuff

This commit is contained in:
Vincent Lee committed 2019-06-08 01:07:26 -07:00
1 parent 2f3a1935cf
commit 7ef12b61d8
650 files changed
+7307 -6234

No files matched your search

@@ -10,11 +10,14 @@ package vazkii.botania.api.state;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockState;
import net.minecraft.item.DyeColor;
import net.minecraft.item.DyeColor;
import net.minecraft.state.BooleanProperty;
import net.minecraft.state.EnumProperty;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
@@ -34,7 +37,7 @@ public final class BotaniaStateProps {
public static final ModelProperty<IFloatingFlower> FLOATING_DATA = new ModelProperty<>();
// The property for platform held blockstate
public static final ModelProperty<IBlockState> HELD_STATE = new ModelProperty<>();
public static final ModelProperty<BlockState> HELD_STATE = new ModelProperty<>();
// The property for platform world pos
public static final ModelProperty<BlockPos> HELD_POS = new ModelProperty<>();
@@ -42,13 +45,13 @@ public final class BotaniaStateProps {
/** Common properties to all blocks to use **/
// The 16 Minecraft colors
public static final EnumProperty<EnumDyeColor> COLOR = EnumProperty.create("color", EnumDyeColor.class);
public static final EnumProperty<DyeColor> COLOR = EnumProperty.create("color", DyeColor.class);
// The four cardinal directions
public static final EnumProperty<EnumFacing> CARDINALS = EnumProperty.create("facing", EnumFacing.class, EnumFacing.Plane.HORIZONTAL);
public static final EnumProperty<Direction> CARDINALS = EnumProperty.create("facing", Direction.class, Direction.Plane.HORIZONTAL);
// All 6 directions
public static final EnumProperty<EnumFacing> FACING = EnumProperty.create("facing", EnumFacing.class);
public static final EnumProperty<Direction> FACING = EnumProperty.create("facing", Direction.class);
// Redstone power - boolean
// Also for any other simple boolean "on/off" state
@@ -60,7 +63,7 @@ public final class BotaniaStateProps {
public static final EnumProperty<AlfPortalState> ALFPORTAL_STATE = EnumProperty.create("state", AlfPortalState.class);
// BlockEnchanter
public static final EnumProperty<EnumFacing.Axis> ENCHANTER_DIRECTION = EnumProperty.create("facing", EnumFacing.Axis.class, Predicates.not(Predicates.equalTo(EnumFacing.Axis.Y)));
public static final EnumProperty<Direction.Axis> ENCHANTER_DIRECTION = EnumProperty.create("facing", Direction.Axis.class, Predicates.not(Predicates.equalTo(Direction.Axis.Y)));
// BlockCraftyCrate
public static final EnumProperty<CratePattern> CRATE_PATTERN = EnumProperty.create("pattern", CratePattern.class);