upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-10-26 14:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from GTNewHorizons/rename

Browse Source 
The renaming
This commit is contained in:
boubou19 authored and GitHub committed 2024-09-03 16:52:03 +02:00
2 parents c3abd86907 e9606af217
commit c2cafd4a98
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+1 -1
View File
@@ -8,7 +8,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Botania:1.11.3-GTNH:api') {transitive = false}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.64:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.10-GTNH:dev')
}
src/main/java/magicbees/tileentity/TileEntityApimancersDrainerGT.java
+7 -7
View File
@@ -12,7 +12,7 @@ import forestry.api.apiculture.IBeeModifier;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
import gregtech.api.metatileentity.BaseMetaTileEntity;
import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary;
import gregtech.common.tileentities.machines.basic.MTEIndustrialApiary;
public class TileEntityApimancersDrainerGT extends TileEntityApimancersDrainerCommon
implements IGregTechDeviceInformation {
@@ -43,7 +43,7 @@ public class TileEntityApimancersDrainerGT extends TileEntityApimancersDrainerCo
BaseMetaTileEntity GTMetaTileEntity = getGTTileEntity(above);
if (GTMetaTileEntity != null) {
IMetaTileEntity underlyingMetaTileEntity = GTMetaTileEntity.getMetaTileEntity();
if (!(underlyingMetaTileEntity instanceof GT_MetaTileEntity_IndustrialApiary)) return null;
if (!(underlyingMetaTileEntity instanceof MTEIndustrialApiary)) return null;
return (IBeeHousing) underlyingMetaTileEntity;
}
@@ -59,14 +59,14 @@ public class TileEntityApimancersDrainerGT extends TileEntityApimancersDrainerCo
@Override
protected ItemStack getQueen(IBeeHousing beeHousing, TileEntity te) {
BaseMetaTileEntity GTMetaTileEntity = getGTTileEntity(te);
GT_MetaTileEntity_IndustrialApiary industrialApiary = getGTIndustrialApiary(GTMetaTileEntity);
MTEIndustrialApiary industrialApiary = getGTIndustrialApiary(GTMetaTileEntity);
return industrialApiary != null ? industrialApiary.getUsedQueen() : super.getQueen(beeHousing, te);
}
@Override
protected int getProductionMultiplier(IBeeModifier modifier, IBee queen, TileEntity te) {
BaseMetaTileEntity GTMetaTileEntity = getGTTileEntity(te);
GT_MetaTileEntity_IndustrialApiary industrialApiary = getGTIndustrialApiary(GTMetaTileEntity);
MTEIndustrialApiary industrialApiary = getGTIndustrialApiary(GTMetaTileEntity);
int housingProductionMultiplier = super.getProductionMultiplier(modifier, queen, te);
return industrialApiary != null
? housingProductionMultiplier * (int) Math.ceil(Math.sqrt(industrialApiary.mSpeed))
@@ -78,11 +78,11 @@ public class TileEntityApimancersDrainerGT extends TileEntityApimancersDrainerCo
return isGTMetaTileEntity ? (BaseMetaTileEntity) te : null;
}
private GT_MetaTileEntity_IndustrialApiary getGTIndustrialApiary(BaseMetaTileEntity bmte) {
private MTEIndustrialApiary getGTIndustrialApiary(BaseMetaTileEntity bmte) {
if (bmte != null) {
IMetaTileEntity underlyingMetaTileEntity = bmte.getMetaTileEntity();
if (!(underlyingMetaTileEntity instanceof GT_MetaTileEntity_IndustrialApiary)) return null;
return (GT_MetaTileEntity_IndustrialApiary) underlyingMetaTileEntity;
if (!(underlyingMetaTileEntity instanceof MTEIndustrialApiary)) return null;
return (MTEIndustrialApiary) underlyingMetaTileEntity;
}
return null;
}