upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-13 00:37:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ci skip] spotlessApply with the new settings

Browse Source
This commit is contained in:
Jason Mitchell committed 2023-01-29 10:24:49 -08:00
1 parent 32411450d3
commit f1069a91f1
148 files changed
+2268 -3179
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/tileentity/AuraCharges.java
+3
View File
@@ -2,11 +2,14 @@ package magicbees.tileentity;
import java.util.HashMap;
import java.util.Map;
import magicbees.bees.AuraCharge;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
public class AuraCharges {
private static final String auraChargesTagName = "AuraCharges";
private final Map<AuraCharge, Long> charges = new HashMap<AuraCharge, Long>(AuraCharge.values().length);
src/main/java/magicbees/tileentity/EffectJarHousing.java
+15 -9
View File
@@ -1,7 +1,20 @@
package magicbees.tileentity;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import magicbees.bees.BeeManager;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import com.google.common.collect.ImmutableSet;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.DefaultBeeListener;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
@@ -13,15 +26,6 @@ import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.IErrorLogic;
import forestry.api.core.IErrorState;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import magicbees.bees.BeeManager;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
/**
* Simulates enough of a bee house to fire the bee effects. =D
@@ -117,6 +121,7 @@ public class EffectJarHousing implements IBeeHousing {
}
private static class JarBeeHousingInventory implements IBeeHousingInventory {
private final TileEntityEffectJar jarEntity;
public JarBeeHousingInventory(TileEntityEffectJar jarEntity) {
@@ -180,6 +185,7 @@ public class EffectJarHousing implements IBeeHousing {
}
private static class JarHousingModifier implements IBeeModifier {
@Override
public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
return 0.9f;
src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java
+1
View File
@@ -1,5 +1,6 @@
package magicbees.tileentity;
public interface ITileEntityAuraCharged {
AuraCharges getAuraCharges();
}
src/main/java/magicbees/tileentity/TileEntityEffectJar.java
+7 -3
View File
@@ -1,9 +1,7 @@
package magicbees.tileentity;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.IBee;
import forestry.api.genetics.IEffectData;
import magicbees.main.CommonProxy;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -12,7 +10,13 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.Constants;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.IBee;
import forestry.api.genetics.IEffectData;
public class TileEntityEffectJar extends TileEntity implements IInventory {
public static final String tileEntityName = CommonProxy.DOMAIN + ".effectJar";
private static final int SLOT_COUNT = 2;
public static final int DRONE_SLOT = 0;
src/main/java/magicbees/tileentity/TileEntityMagicApiary.java
+40 -36
View File
@@ -1,26 +1,11 @@
package magicbees.tileentity;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.DefaultBeeListener;
import forestry.api.apiculture.DefaultBeeModifier;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeHousingInventory;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IBeekeepingLogic;
import forestry.api.apiculture.IBeekeepingMode;
import forestry.api.apiculture.IHiveFrame;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.ForestryAPI;
import forestry.api.core.IErrorLogic;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import magicbees.api.bees.IMagicApiaryAuraProvider;
import magicbees.bees.AuraCharge;
import magicbees.bees.BeeManager;
@@ -29,6 +14,7 @@ import magicbees.main.utils.ChunkCoords;
import magicbees.main.utils.ItemStackUtils;
import magicbees.main.utils.net.EventAuraChargeUpdate;
import magicbees.main.utils.net.NetworkEventHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
@@ -47,6 +33,24 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.util.Constants;
import com.mojang.authlib.GameProfile;
import forestry.api.apiculture.DefaultBeeListener;
import forestry.api.apiculture.DefaultBeeModifier;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IBeeHousing;
import forestry.api.apiculture.IBeeHousingInventory;
import forestry.api.apiculture.IBeeListener;
import forestry.api.apiculture.IBeeModifier;
import forestry.api.apiculture.IBeekeepingLogic;
import forestry.api.apiculture.IBeekeepingMode;
import forestry.api.apiculture.IHiveFrame;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
import forestry.api.core.ForestryAPI;
import forestry.api.core.IErrorLogic;
public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityAuraCharged {
// Constants
@@ -356,8 +360,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
boolean auraChargesChanged = false;
for (AuraCharge charge : AuraCharge.values()) {
if (auraCharges.isActive(charge)
&& auraCharges.isExpired(charge, worldObj)
if (auraCharges.isActive(charge) && auraCharges.isExpired(charge, worldObj)
&& (auraProvider == null || !auraProvider.getCharge(charge.type))) {
auraCharges.stop(charge);
auraChargesChanged = true;
@@ -391,20 +394,22 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
private List<Chunk> getChunksInSearchRange() {
List<Chunk> chunks = new ArrayList<Chunk>(4);
chunks.add(worldObj.getChunkFromBlockCoords(
xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS));
Chunk chunk = worldObj.getChunkFromBlockCoords(
xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS);
chunks.add(
worldObj.getChunkFromBlockCoords(
xCoord - AURAPROVIDER_SEARCH_RADIUS,
zCoord - AURAPROVIDER_SEARCH_RADIUS));
Chunk chunk = worldObj
.getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS);
if (!chunks.contains(chunk)) {
chunks.add(chunk);
}
chunk = worldObj.getChunkFromBlockCoords(
xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS);
chunk = worldObj
.getChunkFromBlockCoords(xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS);
if (!chunks.contains(chunk)) {
chunks.add(chunk);
}
chunk = worldObj.getChunkFromBlockCoords(
xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS);
chunk = worldObj
.getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS);
if (!chunks.contains(chunk)) {
chunks.add(chunk);
}
@@ -414,8 +419,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
@SuppressWarnings("unchecked")
private boolean searchChunkForBooster(Chunk chunk) {
Vec3 apiaryPos = Vec3.createVectorHelper(xCoord, yCoord, zCoord);
for (Map.Entry<ChunkPosition, TileEntity> entry :
((Map<ChunkPosition, TileEntity>) chunk.chunkTileEntityMap).entrySet()) {
for (Map.Entry<ChunkPosition, TileEntity> entry : ((Map<ChunkPosition, TileEntity>) chunk.chunkTileEntityMap)
.entrySet()) {
TileEntity entity = entry.getValue();
if (entity instanceof IMagicApiaryAuraProvider) {
Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord);
@@ -477,6 +482,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
}
private static class MagicApiaryInventory implements IBeeHousingInventory {
public static final int SLOT_QUEEN = 0;
public static final int SLOT_DRONE = 1;
public static final int SLOT_FRAME_START = 2;
@@ -514,8 +520,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
@Override
public boolean addProduct(ItemStack product, boolean all) {
int countAdded =
ItemStackUtils.addItemToInventory(magicApiary, product, SLOT_PRODUCTS_START, SLOT_PRODUCTS_COUNT);
int countAdded = ItemStackUtils
.addItemToInventory(magicApiary, product, SLOT_PRODUCTS_START, SLOT_PRODUCTS_COUNT);
if (all) {
return countAdded == product.stackSize;
@@ -542,7 +548,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
public int[] getAccessibleSlotsFromSide(int side) {
if (side == 0 || side == 1) {
return new int[] {SLOT_QUEEN, SLOT_DRONE};
return new int[] { SLOT_QUEEN, SLOT_DRONE };
} else {
int[] slots = new int[SLOT_PRODUCTS_COUNT];
for (int i = 0, slot = SLOT_PRODUCTS_START; i < SLOT_PRODUCTS_COUNT; ++i, ++slot) {
@@ -553,8 +559,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
}
public boolean canInsertItem(int slot, ItemStack itemStack, int side) {
if (slot == SLOT_QUEEN
&& BeeManager.beeRoot.isMember(itemStack)
if (slot == SLOT_QUEEN && BeeManager.beeRoot.isMember(itemStack)
&& !BeeManager.beeRoot.isDrone(itemStack)) {
return true;
} else if (slot == SLOT_DRONE && BeeManager.beeRoot.isDrone(itemStack)) {
@@ -680,9 +685,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory
IBeekeepingMode beekeepingMode = BeeManager.beeRoot.getBeekeepingMode(magicApiary.getWorldObj());
int wear = Math.round(amount * beekeepingMode.getWearModifier());
for (int i = MagicApiaryInventory.SLOT_FRAME_START;
i < MagicApiaryInventory.SLOT_FRAME_START + MagicApiaryInventory.SLOT_FRAME_COUNT;
i++) {
for (int i = MagicApiaryInventory.SLOT_FRAME_START; i
< MagicApiaryInventory.SLOT_FRAME_START + MagicApiaryInventory.SLOT_FRAME_COUNT; i++) {
ItemStack hiveFrameStack = magicApiary.getStackInSlot(i);
if (hiveFrameStack == null) {
continue;
src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java
+7 -4
View File
@@ -1,22 +1,24 @@
package magicbees.tileentity;
import cpw.mods.fml.common.Optional;
import java.util.HashMap;
import java.util.Map;
import magicbees.api.bees.AuraChargeType;
import magicbees.api.bees.IMagicApiaryAuraProvider;
import magicbees.bees.AuraCharge;
import magicbees.main.CommonProxy;
import magicbees.main.utils.compat.BotaniaHelper;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import vazkii.botania.api.mana.IManaReceiver;
import cpw.mods.fml.common.Optional;
@Optional.InterfaceList({
@Optional.Interface(iface = "vazkii.botania.api.mana.IManaReceiver", modid = BotaniaHelper.Name)
})
@Optional.Interface(iface = "vazkii.botania.api.mana.IManaReceiver", modid = BotaniaHelper.Name) })
public class TileEntityManaAuraProvider extends TileEntity implements IMagicApiaryAuraProvider, IManaReceiver {
public static final String tileEntityName = CommonProxy.DOMAIN + ".manaAuraProvider";
@@ -26,11 +28,12 @@ public class TileEntityManaAuraProvider extends TileEntity implements IMagicApia
private static final int MAX_MANA = MANA_PER_CHARGE * 4;
private static class ManaAuraCharge {
int charges;
int mana;
public int[] toArray() {
return new int[] {charges, mana};
return new int[] { charges, mana };
}
public void fromArray(int[] array) {
src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java
+5 -1
View File
@@ -2,12 +2,15 @@ package magicbees.tileentity;
import java.util.HashMap;
import java.util.Map;
import magicbees.api.bees.AuraChargeType;
import magicbees.api.bees.IMagicApiaryAuraProvider;
import magicbees.bees.AuraCharge;
import magicbees.main.CommonProxy;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.visnet.VisNetHandler;
@@ -27,11 +30,12 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar
}
private static class VisAuraCharge {
int charges;
int vis;
public int[] toArray() {
return new int[] {charges, vis};
return new int[] { charges, vis };
}
public void fromArray(int[] array) {