diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/goodgenerator/items | |
parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/goodgenerator/items')
-rw-r--r-- | src/main/java/goodgenerator/items/GGItem.java (renamed from src/main/java/goodgenerator/items/MyItems.java) | 12 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/GGItemBlocks.java (renamed from src/main/java/goodgenerator/items/MyItemBlocks.java) | 20 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/GGMaterial.java (renamed from src/main/java/goodgenerator/items/MyMaterial.java) | 13 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/ItemDepletedFuelRod.java (renamed from src/main/java/goodgenerator/items/DepletedFuelRod.java) | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/ItemFuelRod.java (renamed from src/main/java/goodgenerator/items/FuelRod.java) | 15 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/RadioactiveItem.java | 6 |
6 files changed, 35 insertions, 35 deletions
diff --git a/src/main/java/goodgenerator/items/MyItems.java b/src/main/java/goodgenerator/items/GGItem.java index 71a67d4fd6..627cf1c59b 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/GGItem.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.main.GoodGenerator; -public class MyItems extends Item { +public class GGItem extends Item { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -26,14 +26,14 @@ public class MyItems extends Item { private List<String> tooltips = new ArrayList<>(); private List<String> tooltipses = new ArrayList<>(); - public MyItems(String name, CreativeTabs Tab) { + public GGItem(String name, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; this.Name = name; } - public MyItems(String name, CreativeTabs Tab, String[] textures) { + public GGItem(String name, CreativeTabs Tab, String[] textures) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.setHasSubtypes(true); @@ -41,7 +41,7 @@ public class MyItems extends Item { this.Name = name; } - public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { + public GGItem(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.setHasSubtypes(true); @@ -50,7 +50,7 @@ public class MyItems extends Item { this.tooltipses = Arrays.asList(tooltip); } - public MyItems(String name, String tooltip, CreativeTabs Tab) { + public GGItem(String name, String tooltip, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; @@ -58,7 +58,7 @@ public class MyItems extends Item { this.Name = name; } - public MyItems(String name, String[] tooltip, CreativeTabs Tab) { + public GGItem(String name, String[] tooltip, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/GGItemBlocks.java index 3ee7347e97..2d13d7a7af 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/GGItemBlocks.java @@ -16,21 +16,21 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.blocks.regularBlock.TEBlock; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; +import goodgenerator.blocks.regularBlock.BlockTEContainer; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch; import goodgenerator.main.GoodGenerator; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; -public class MyItemBlocks extends ItemBlock { +public class GGItemBlocks extends ItemBlock { - private final String mNoMobsToolTip = GT_LanguageManager + private final String mNoMobsToolTip = GTLanguageManager .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - private final String mNoTileEntityToolTip = GT_LanguageManager + private final String mNoTileEntityToolTip = GTLanguageManager .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - public MyItemBlocks(Block block) { + public GGItemBlocks(Block block) { super(block); this.setMaxDamage(0); this.setHasSubtypes(true); @@ -71,15 +71,15 @@ public class MyItemBlocks extends ItemBlock { public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if (stack == null) return; tooltip.add(mNoMobsToolTip); - if (Block.getBlockFromItem(stack.getItem()) instanceof TEBlock) { - TEBlock tile = (TEBlock) Block.getBlockFromItem(stack.getItem()); + if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTEContainer) { + BlockTEContainer tile = (BlockTEContainer) Block.getBlockFromItem(stack.getItem()); if (tile.getIndex() == 1) tooltip.addAll(Arrays.asList(DescTextLocalization.addText("EssentiaHatch.tooltip", 2))); if (tile.getIndex() == 2) { tooltip.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.0")); tooltip.add( StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " - + EssentiaOutputHatch.CAPACITY); + + MTEEssentiaOutputHatch.CAPACITY); } } else { tooltip.add(mNoTileEntityToolTip); diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index 9d0dfc7b6e..aeade9eb00 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -1,17 +1,16 @@ package goodgenerator.items; -import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import static bartworks.util.BWUtil.subscriptNumbers; import static gregtech.api.enums.Materials.*; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.Pair; - +import bartworks.system.material.Werkstoff; +import bartworks.system.material.WerkstoffLoader; +import bartworks.util.Pair; import goodgenerator.util.CharExchanger; import gregtech.api.enums.TextureSet; @SuppressWarnings({ "unchecked" }) -public class MyMaterial implements Runnable { +public class GGMaterial implements Runnable { protected static final int OffsetID = 10001; @@ -289,7 +288,7 @@ public class MyMaterial implements Runnable { .addMultipleIngotMetalWorkingItems(), OffsetID + 21, TextureSet.SET_SHINY, - new Pair<>(MyMaterial.orundum, 2), + new Pair<>(GGMaterial.orundum, 2), new Pair<>(Plutonium, 1), new Pair<>(Naquadah, 2)); diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/ItemDepletedFuelRod.java index 308f149933..b08df4d5a3 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/ItemDepletedFuelRod.java @@ -7,9 +7,9 @@ import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; -public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { +public class ItemDepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { - public DepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { + public ItemDepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { super(name, tooltip, Tab, Rad); } diff --git a/src/main/java/goodgenerator/items/FuelRod.java b/src/main/java/goodgenerator/items/ItemFuelRod.java index 00ca8b3491..89acdf6933 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/ItemFuelRod.java @@ -14,14 +14,14 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.core.util.StackUtil; import ic2.core.util.Util; -public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { +public class ItemFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { private final int numberOfCells; private final int maxDmg; @@ -30,7 +30,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private float HeatBonus = 0; private final ItemStack result; - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, + public ItemFuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); @@ -42,7 +42,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa setMaxDamage(100); } - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, + public ItemFuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); @@ -74,7 +74,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); heat = sumUp(pulses) * this.Heat; - ArrayList<FuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); + ArrayList<ItemFuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); this.checkHeatAcceptor(reactor, x - 1, y, heatAcceptors); this.checkHeatAcceptor(reactor, x + 1, y, heatAcceptors); this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); @@ -99,7 +99,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } } if (this.getCustomDamage(stack) >= this.getMaxCustomDamage(stack) - 1) { - reactor.setItemAt(x, y, GT_Utility.copyAmount(1, result)); + reactor.setItemAt(x, y, GTUtility.copyAmount(1, result)); } else if (heatRun) { this.applyCustomDamage(stack, 1, null); } @@ -117,7 +117,8 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa return (x * x + x) / 2; } - private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<FuelRod.ItemStackCoord> heatAcceptors) { + private void checkHeatAcceptor(IReactor reactor, int x, int y, + ArrayList<ItemFuelRod.ItemStackCoord> heatAcceptors) { ItemStack thing = reactor.getItemAt(x, y); if (thing != null && thing.getItem() instanceof IReactorComponent && ((IReactorComponent) thing.getItem()).canStoreHeat(reactor, thing, x, y)) { diff --git a/src/main/java/goodgenerator/items/RadioactiveItem.java b/src/main/java/goodgenerator/items/RadioactiveItem.java index ab6c003268..3ce175bd78 100644 --- a/src/main/java/goodgenerator/items/RadioactiveItem.java +++ b/src/main/java/goodgenerator/items/RadioactiveItem.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.core.IC2Potion; -public class RadioactiveItem extends MyItems { +public class RadioactiveItem extends GGItem { protected final int mRadio; @@ -34,7 +34,7 @@ public class RadioactiveItem extends MyItems { public void onUpdate(ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) { super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand); EntityLivingBase tPlayer = (EntityPlayer) aPlayer; - if (!GT_Utility.isWearingFullRadioHazmat(tPlayer)) + if (!GTUtility.isWearingFullRadioHazmat(tPlayer)) tPlayer.addPotionEffect(new PotionEffect(IC2Potion.radiation.id, mRadio, 4)); } } |