From faeac4494c1ecdc163444afaa2c27cb3e4badcca Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 17 Mar 2019 13:22:06 -0500 Subject: [PATCH] update forge --- build.gradle | 26 ++++++++++++------- .../client/gui/bag/InventoryFlowerBag.java | 5 ++++ .../common/block/BlockLightLauncher.java | 2 +- .../generating/SubTileHydroangeas.java | 2 +- .../botania/common/block/tile/TileAvatar.java | 2 +- .../block/tile/TileFloatingSpecialFlower.java | 2 +- .../common/block/tile/TileHourglass.java | 2 +- .../common/block/tile/mana/TilePump.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 2 +- .../botania/common/item/ItemSextant.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../botania/common/item/lens/LensPaint.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 2 +- 13 files changed, 32 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 11fe2e3f4..6875e5e80 100644 --- a/build.gradle +++ b/build.gradle @@ -31,17 +31,25 @@ minecraft { mappings channel: 'snapshot', version: '20190313-1.13.2' accessTransformer = file('src/main/resources/META-INF/botania_at.cfg') runs { - client = { + client { properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' properties 'forge.logging.console.level': 'debug' - workingDirectory project.file('run').canonicalPath - source sourceSets.main + workingDirectory project.file('run') + mods { + botania { + source sourceSets.main + } + } } - server = { + server { properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP' properties 'forge.logging.console.level': 'debug' - workingDirectory project.file('run').canonicalPath - source sourceSets.main + workingDirectory project.file('run') + mods { + botania { + source sourceSets.main + } + } } } // replace 'GRADLE:BUILD', config.build_number @@ -51,7 +59,7 @@ minecraft { } dependencies { - minecraft 'net.minecraftforge:forge:1.13.2-25.0.10' + minecraft 'net.minecraftforge:forge:1.13.2-25.0.85' } repositories { @@ -88,7 +96,7 @@ jar { manifest { attributes(["Specification-Title": "botania", "Specification-Vendor": "botania", - "Specification-Version": "24.0", + "Specification-Version": "1", "Implementation-Title": project.name, "Implementation-Version": "${version}", "Implementation-Vendor": "botania", @@ -151,8 +159,6 @@ task incrementBuildNumber { config.toProperties().store(it, "") } - // todo make this flexibile - collection of supported mc versions - file('web/versions.ini').append("\n${version}=${minecraft.version}") file("${config.dir_repo}/version/${minecraft.version}.txt").write("${version}") } diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index a95e4dccd..350c7f559 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -58,4 +58,9 @@ public class InventoryFlowerBag implements IItemHandlerModifiable { public int getSlotLimit(int slot) { return bagInv.getSlotLimit(slot); } + + @Override + public boolean isItemValid(int slot, @Nonnull ItemStack stack) { + return bagInv.isItemValid(slot, stack); + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index b11f79d13..11a603f90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -76,7 +76,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { private void pickUpEntities(World world, BlockPos pos) { List relays = new ArrayList<>(); - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile instanceof TileLightRelay) { TileLightRelay relay = (TileLightRelay) tile; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index d7f9a93bd..474cc8adf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -74,7 +74,7 @@ public class SubTileHydroangeas extends SubTileGenerating { supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState()); else { int waterAround = 0; - for(EnumFacing dir : EnumFacing.BY_INDEX) + for(EnumFacing dir : EnumFacing.values()) if(supertile.getWorld().getFluidState(pos.offset(dir)).isTagged(search)) waterAround++; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 7cbd06230..dd4f3fc9a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -47,7 +47,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITic @Override public void tick() { enabled = true; - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { enabled = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index 862680eff..57216f60e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -45,7 +45,7 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo @Override public void writePacketNBT(NBTTagCompound cmp) { super.writePacketNBT(cmp); - cmp.setString(TAG_ISLAND_TYPE, type.toString()); + cmp.putString(TAG_ISLAND_TYPE, type.toString()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 29abfd262..908d9043d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -81,7 +81,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickable { world.getPendingBlockTicks().scheduleTick(pos, getBlockState().getBlock(), getBlockState().getBlock().tickRate(world)); } - for(EnumFacing facing : EnumFacing.BY_INDEX) { + for(EnumFacing facing : EnumFacing.values()) { BlockPos pos = getPos().offset(facing); IBlockState state = world.getBlockState(pos); if(state.getBlock() instanceof IHourglassTrigger) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 152099e24..7cd221876 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -74,7 +74,7 @@ public class TilePump extends TileMod implements ITickable { @Override public void tick() { hasRedstone = false; - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { hasRedstone = true; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 8f700022f..b8a0aae75 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -198,7 +198,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean redstone = false; - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { TileEntity tileAt = world.getTileEntity(pos.offset(dir)); if(world.isBlockLoaded(pos.offset(dir), false) && tileAt instanceof IManaPool) { IManaPool pool = (IManaPool) tileAt; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 967661b47..cb2690670 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -185,7 +185,7 @@ public class ItemSextant extends ItemMod { @Override public Map createRotations() { Map ret = new EnumMap<>(EnumFacing.class); - for (EnumFacing e : EnumFacing.BY_INDEX) { + for (EnumFacing e : EnumFacing.values()) { ret.put(e, this); } return ret; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 05385b985..679f04347 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -166,7 +166,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { TileEntity tile = player.world.getTileEntity(pos_); if(tile != null) { boolean foundCap = false; - for(EnumFacing e : EnumFacing.BY_INDEX) { + for(EnumFacing e : EnumFacing.values()) { if(scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { blockPosBuilder.add(new NBTTagLong(pos_.toLong())); foundCap = true; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index ebd81c340..f33c69cce 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -58,7 +58,7 @@ public class LensPaint extends Lens { coordsFound.remove(coords); coordsToPaint.add(coords); - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { IBlockState state_ = entity.world.getBlockState(coords.offset(dir)); BlockPos coords_ = new BlockPos(coords.offset(dir)); if(state_ == state && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_)) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 06db71d89..833b7af66 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -189,7 +189,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra continue; // Check to see if the block is visible on any side: - for(EnumFacing dir : EnumFacing.BY_INDEX) { + for(EnumFacing dir : EnumFacing.values()) { BlockPos adjPos = pos_.offset(dir); IBlockState adjState = world.getBlockState(adjPos);