mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-14 17:24:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f497114579 | ||
|
|
ea547df4d0 | ||
|
|
39c9f1f6c6 | ||
|
|
4000763323 | ||
|
|
59e98dd290 | ||
|
|
c1ec3e5c8e | ||
|
|
ac4b21b05e | ||
|
|
0e0ded5cc0 |
No files matched your search
+6
-6
@@ -1,12 +1,12 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:ForestryMC:4.10.1:dev')
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.6.2: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.20-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")
|
||||
}
|
||||
+1
-1
@@ -14,7 +14,7 @@ modId = BinnieCore
|
||||
modGroup = binnie
|
||||
|
||||
# Whether to use modGroup as the maven publishing group.
|
||||
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
|
||||
# When false, com.github.GTNewHorizons is used.
|
||||
useModGroupForPublishing = false
|
||||
|
||||
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
|
||||
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -86,8 +86,7 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -206,7 +205,7 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
+1
-1
@@ -17,5 +17,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
|
||||
}
|
||||
@@ -34,6 +34,7 @@ public class BlockStained extends Block implements IBlockMetadata {
|
||||
|
||||
public BlockStained() {
|
||||
super(Material.glass);
|
||||
setHardness(0.3f);
|
||||
setCreativeTab(CreativeTabBotany.instance);
|
||||
setBlockName("stained");
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -376,7 +376,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
|
||||
|
||||
float modeYieldMod = 1.0f;
|
||||
for (Map.Entry<ItemStack, Float> entry2 : products.entrySet()) {
|
||||
if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * stage) {
|
||||
if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry2.getValue() * 5.0f * stage) {
|
||||
product2.add(entry2.getKey().copy());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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