mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-14 17:24:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b551eb8ec | ||
|
|
f497114579 | ||
|
|
ea547df4d0 | ||
|
|
39c9f1f6c6 | ||
|
|
4000763323 | ||
|
|
59e98dd290 | ||
|
|
c1ec3e5c8e |
No files matched your search
+6
-6
@@ -1,12 +1,12 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:ForestryMC:4.10.5:dev')
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.6.18:dev')
|
||||
api('com.github.GTNewHorizons:ForestryMC:4.10.13:dev')
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.6.36:dev')
|
||||
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.34-GTNH:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev')
|
||||
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
|
||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
|
||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||
}
|
||||
@@ -34,6 +34,7 @@ public class BlockStained extends Block implements IBlockMetadata {
|
||||
|
||||
public BlockStained() {
|
||||
super(Material.glass);
|
||||
setHardness(0.3f);
|
||||
setCreativeTab(CreativeTabBotany.instance);
|
||||
setBlockName("stained");
|
||||
}
|
||||
|
||||
@@ -488,7 +488,9 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
|
||||
|
||||
public void updateTabs() {
|
||||
CompartmentTab tab = getCurrentTab();
|
||||
tabName.setValue(tab.getName());
|
||||
if (!tabName.isFocused()) {
|
||||
tabName.setValue(tab.getName());
|
||||
}
|
||||
tabIcon.setItemStack(tab.getIcon());
|
||||
tabColour.setValue(tab.getColor());
|
||||
}
|
||||
|
||||
@@ -18,8 +18,7 @@ public class MutatorModifierComponent extends ComponentBeeModifier implements IB
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
float mult = AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
|
||||
return Math.min(mult, 15.0f / currentModifier);
|
||||
return AlvearyMutator.getMutationMult(getUtil().getStack(AlvearyMutator.SLOT_MUTATOR));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -389,34 +389,27 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
}
|
||||
|
||||
private void onFoodEffect(IBeeGenome genome, IBeeHousing housing) {
|
||||
for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
|
||||
if (entity instanceof EntityPlayer player) {
|
||||
player.getFoodStats().addStats(2, 0.2f);
|
||||
}
|
||||
for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
|
||||
player.getFoodStats().addStats(2, 0.2f);
|
||||
}
|
||||
}
|
||||
|
||||
private void onHungerEffect(IBeeGenome genome, IBeeHousing housing, World world) {
|
||||
for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
|
||||
if (entity instanceof EntityPlayer player) {
|
||||
if (world.rand.nextInt(4) < wearsItems(player)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
player.getFoodStats().addExhaustion(4.0f);
|
||||
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 100));
|
||||
for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
|
||||
if (world.rand.nextInt(4) < wearsItems(player)) {
|
||||
continue;
|
||||
}
|
||||
player.addExhaustion(4.0f);
|
||||
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 100));
|
||||
}
|
||||
}
|
||||
|
||||
private void onPotionEffect(IBeeGenome genome, IBeeHousing housing, World world, PotionEffect potion) {
|
||||
for (EntityLivingBase entity : getEntities(EntityLivingBase.class, genome, housing)) {
|
||||
if (entity instanceof EntityPlayer player) {
|
||||
if (world.rand.nextInt(4) < wearsItems(player)) {
|
||||
continue;
|
||||
}
|
||||
player.addPotionEffect(potion);
|
||||
for (EntityPlayer player : getEntities(EntityPlayer.class, genome, housing)) {
|
||||
if (world.rand.nextInt(4) < wearsItems(player)) {
|
||||
continue;
|
||||
}
|
||||
player.addPotionEffect(potion);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -611,13 +604,16 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
|
||||
public <T extends Entity> List<T> getEntities(Class<T> eClass, IBeeGenome genome, IBeeHousing housing) {
|
||||
int[] area = genome.getTerritory();
|
||||
int[] offset = { -Math.round(area[0] / 2f), -Math.round(area[1] / 2f), -Math.round(area[2] / 2f) };
|
||||
int[] min = { housing.getCoordinates().posX + offset[0], housing.getCoordinates().posY + offset[1],
|
||||
housing.getCoordinates().posZ + offset[2] };
|
||||
int[] max = { housing.getCoordinates().posX + offset[0] + area[0],
|
||||
housing.getCoordinates().posY + offset[1] + area[1],
|
||||
housing.getCoordinates().posZ + offset[2] + area[2] };
|
||||
AxisAlignedBB box = AxisAlignedBB.getBoundingBox(min[0], min[1], min[2], max[0], max[1], max[2]);
|
||||
int offsetX = -Math.round(area[0] / 2f);
|
||||
int offsetY = -Math.round(area[1] / 2f);
|
||||
int offsetZ = -Math.round(area[2] / 2f);
|
||||
int minX = housing.getCoordinates().posX + offsetX;
|
||||
int minY = housing.getCoordinates().posY + offsetY;
|
||||
int minZ = housing.getCoordinates().posZ + offsetZ;
|
||||
int maxX = housing.getCoordinates().posX + offsetX + area[0];
|
||||
int maxY = housing.getCoordinates().posY + offsetY + area[1];
|
||||
int maxZ = housing.getCoordinates().posZ + offsetZ + area[2];
|
||||
AxisAlignedBB box = AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ);
|
||||
return housing.getWorld().getEntitiesWithinAABB(eClass, box);
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ public class WindowGeneBank extends WindowMachine {
|
||||
protected ControlGeneScroll genes;
|
||||
|
||||
public WindowGeneBank(EntityPlayer player, IInventory inventory, Side side, boolean isNEI) {
|
||||
super(320, 224, player, inventory, side);
|
||||
super(400, 224, player, inventory, side);
|
||||
isNei = isNEI;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public class WindowGeneBank extends WindowMachine {
|
||||
new ControlPlayerInventory(this, x, y);
|
||||
x += 124;
|
||||
boxX = x;
|
||||
int geneBoxWidth = 120;
|
||||
int geneBoxWidth = 200;
|
||||
new Panel(this, boxX + 24, 32.0f, geneBoxWidth, 120.0f, MinecraftGUI.PanelType.Black);
|
||||
new Panel(this, boxX + 24 + geneBoxWidth, 32.0f, 14.0f, 120.0f, MinecraftGUI.PanelType.Gray);
|
||||
ControlScrollableContent scroll = new ControlScrollableContent(
|
||||
|
||||
Reference in new issue
Block a user