Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEndspark;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEtherealGlass;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockFilingCabinet;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockFloating;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockGigaTorch;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockHeavenly;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockInverted;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockLapisAetherius;
import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockLapisAetheriusDyable;
Expand Down Expand Up @@ -81,7 +81,7 @@ public enum ModBlocks {
// spotless:off

// make sure to leave a trailing comma
FLOATING_BLOCK(BlockConfig.enableFloatingBlock, new BlockFloating(), BlockFloating.ItemBlockFloating.class, "floating_block"),
HEAVENLY_BLOCK(BlockConfig.enableHeavenlyBlock, new BlockHeavenly(), BlockHeavenly.ItemBlockHeavenly.class, "heavenly_block"),
COMPRESSED_COBBLESTONE(BlockConfig.enableCompressedCobblestone, new BlockCompressed(Blocks.cobblestone, "compressed_cobblestone"), BlockCompressed.ItemCompressedBlock.class, "compressed_cobblestone"),
COMPRESSED_DIRT(BlockConfig.enableCompressedDirt, new BlockCompressed(Blocks.dirt, "compressed_dirt"), BlockCompressed.ItemCompressedBlock.class, "compressed_dirt"),
COMPRESSED_SAND(BlockConfig.enableCompressedSand, new BlockCompressed(Blocks.sand, "compressed_sand"), BlockCompressed.ItemCompressedBlock.class, "compressed_sand"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static void IMCSender() {
sendInfoPage("utilitiesinexcess:glove", "uie.nei.infopage.glove.1");
if (Mods.Baubles.isLoaded()) sendInfoPage("utilitiesinexcess:glove", "uie.nei.infopage.glove.2");

sendInfoPage("<utilitiesinexcess:floating_block>", "uie.nei.infopage.floating_block.1");
sendInfoPage("<utilitiesinexcess:heavenly_block>", "uie.nei.infopage.heavenly_block.1");

sendInfoPage("<utilitiesinexcess:redstone_clock>", "uie.nei.infopage.redstone_clock.1");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

import com.fouristhenumber.utilitiesinexcess.ModBlocks;

public class BlockFloating extends Block {
public class BlockHeavenly extends Block {

public BlockFloating() {
public BlockHeavenly() {
super(Material.rock);
setBlockName("floating_block");
setBlockTextureName("utilitiesinexcess:floating_block");
setBlockName("heavenly_block");
setBlockTextureName("utilitiesinexcess:heavenly_block");
setHardness(0.0F);
setResistance(7.0F);
}
Expand All @@ -41,16 +41,16 @@ public boolean canHarvestBlock(EntityPlayer player, int meta) {
@Override
public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) {
if (player != null) {
EntityItem entityItem = player.dropItem(ModBlocks.FLOATING_BLOCK.getItem(), 1);
EntityItem entityItem = player.dropItem(ModBlocks.HEAVENLY_BLOCK.getItem(), 1);
entityItem.delayBeforeCanPickup = 0;
} else {
super.harvestBlock(world, player, x, y, z, meta);
}
}

public static class ItemBlockFloating extends ItemBlock {
public static class ItemBlockHeavenly extends ItemBlock {

public ItemBlockFloating(Block block) {
public ItemBlockHeavenly(Block block) {
super(block);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ public static void run() {
'e',
Items.ender_eye);

// Floating Block
if (RecipeConfig.enableFloatingBlockRecipe) addShapedRecipe(
ModBlocks.FLOATING_BLOCK,
// Heavenly Block
if (RecipeConfig.enableHeavenlyBlockRecipe) addShapedRecipe(
ModBlocks.HEAVENLY_BLOCK,
" g ",
"fof",
'g',
Expand Down Expand Up @@ -1449,7 +1449,7 @@ private static void loadInversionRecipes() {
'i',
ModItems.INVERTED_INGOT.newItemStack(1, OreDictionary.WILDCARD_VALUE),
'f',
ModBlocks.FLOATING_BLOCK);
ModBlocks.HEAVENLY_BLOCK);

// Architect's Wand
if (RecipeConfig.enableArchitectsWandRecipe) addShapedRecipe(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private static void transformBlocks() {
.addSimpleReplacement("ExtraUtilities:dark_portal", 2, ModBlocks.END_OF_TIME_PORTAL.get());
BlockReplacementManager
.addSimpleReplacement("ExtraUtilities:dark_portal", 3, ModBlocks.END_OF_TIME_PORTAL.get());
BlockReplacementManager.addSimpleReplacement("ExtraUtilities:angelBlock", ModBlocks.FLOATING_BLOCK.get());
BlockReplacementManager.addSimpleReplacement("ExtraUtilities:angelBlock", ModBlocks.HEAVENLY_BLOCK.get());
BlockReplacementManager
.addSimpleReplacement("ExtraUtilities:budoff", 3, ModBlocks.ADVANCED_BLOCK_UPDATE_DETECTOR.get(), 0);
BlockReplacementManager.addSimpleReplacement("ExtraUtilities:budoff", ModBlocks.BLOCK_UPDATE_DETECTOR.get());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) {
public static void registerAliases() {
// spotless:off
ArrayList<ItemStack> aliasedItemStacks = new ArrayList<>(List.of(
new ItemStack(ModBlocks.FLOATING_BLOCK.getItem()),
new ItemStack(ModBlocks.HEAVENLY_BLOCK.getItem()),
new ItemStack(ModBlocks.UNDERWORLD_PORTAL.getItem()),
new ItemStack(ModBlocks.END_OF_TIME_PORTAL.getItem()),
new ItemStack(ModBlocks.PACIFISTS_BENCH.getItem()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public class RecipeConfig {

@Config.RequiresMcRestart
@Config.DefaultBoolean(true)
public static boolean enableFloatingBlockRecipe;
public static boolean enableHeavenlyBlockRecipe;

@Config.RequiresMcRestart
@Config.DefaultBoolean(true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public static class PacifistsBench {

@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean enableFloatingBlock;
public static boolean enableHeavenlyBlock;

@Config.DefaultBoolean(false)
@Config.Comment("If enabled, inverted block will have a similar X-Ray effect to Extra Utilities' Unstable Block.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Žhavící cívka
item.block_analyzer.aliases=Přenosný skenr
item.xray_glasses.aliases=Sonarové brýle
item.inverted_ingot.aliases=Nestabilní cihlička
tile.floating_block.aliases=Andělský blok
tile.heavenly_block.aliases=Andělský blok
tile.underworld_portal.aliases=Portál do 'Hlubokého temna'
tile.endspark.aliases=Endeří jádro
tile.inverted_block.aliases=Nestabilní cihličkový blok
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Heizwendel
item.block_analyzer.aliases=Tragbarer Scanner
item.xray_glasses.aliases=Sonarbrille
item.inverted_ingot.aliases=Labiler Barren
tile.floating_block.aliases=Engelsblock
tile.heavenly_block.aliases=Engelsblock
tile.underworld_portal.aliases=Portal zur 'Deep Dark'
tile.endspark.aliases=Enderkern
tile.inverted_block.aliases=Labiler Barrenblock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ item.mob_jar.aliases=Golden Rope
item.block_analyzer.aliases=Device o' "What be' this doin'"?
item.xray_glasses.aliases=Where be' the 'ores and ores?
item.inverted_ingot.aliases=Why be this bullion so hot?
tile.floating_block.aliases=Block o' Air Buildin'
tile.heavenly_block.aliases=Block o' Air Buildin'
tile.underworld_portal.aliases=Portal to the 'Voodoo Realm'
tile.endspark.aliases=Tall-Mans Booty
tile.inverted_block.aliases=Chunk O' Maff
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/utilitiesinexcess/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ uie.nei.text.pseudo_reversion.requires=Requires %s unique items from:

### NEI Infopage
uie.nei.infopage.compressed.1=Tons of spare blocks lying around? Save yourself some space by compacting them. Compressible blocks can be repeatedly compressed up to eight times!
uie.nei.infopage.floating_block.1=Floating blocks can be placed in midair. Helpful for building in the middle of the sky.
uie.nei.infopage.heavenly_block.1=Heavenly blocks can be placed in midair. Helpful for building in the middle of the sky.
uie.nei.infopage.bedrockium.1=Bedrockium is a supremely strong material named after the virtually impervious foundation of the world. It is immensely heavy and slows you to a crawl while holding it.
uie.nei.infopage.ethereal_glass.0=Ethereal Glass makes for the perfect zombie-proof door. It stops all creatures in their tracks while letting players through. Sneaking causes players to collide with this block. Ineffable Glass is a variant block with connected textures.
uie.nei.infopage.ethereal_glass.2=Dark Ethereal Glass works just like Ethereal Glass, stopping creatures and allowing players who aren't sneaking to pass through, but it also blocks light. How can you see through it? Stop asking so many questions!
Expand Down Expand Up @@ -146,7 +146,7 @@ ue_wall.name=%s Wall
ue_fence.name=%s Fence
ue_sphere.name=%s Impossible Object

tile.floating_block.name=Floating Block
tile.heavenly_block.name=Heavenly Block
tile.bedrockium_block.name=Block of Bedrockium
tile.inverted_block.name=Inverted Block

Expand Down Expand Up @@ -371,7 +371,7 @@ tile.sound_muffler.name=Sound Muffler
tile.rain_muffler.name=Rain Muffler

### Block aliases
tile.floating_block.aliases=Angel Block
tile.heavenly_block.aliases=Angel Block
tile.marginally_maximised_chest.aliases=Slightly Larger Chest
tile.radically_reduced_chest.aliases=Mini-Chest
tile.significantly_shrunk_chest.aliases=Mini-Chest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobina de Calefacción
item.block_analyzer.aliases=Escáner Portátil
item.xray_glasses.aliases=Gafas Sónar
item.inverted_ingot.aliases=Lingote Inestable
tile.floating_block.aliases=Bloque Angélico
tile.heavenly_block.aliases=Bloque Angélico
tile.underworld_portal.aliases=Portal a la 'Profunda Oscuridad'
tile.endspark.aliases=Núcleo de Ender
tile.inverted_block.aliases=Bloque Inestable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobina de Calefacción
item.block_analyzer.aliases=Escáner Portátil
item.xray_glasses.aliases=Gafas Sónar
item.inverted_ingot.aliases=Lingote Inestable
tile.floating_block.aliases=Bloque Angélico
tile.heavenly_block.aliases=Bloque Angélico
tile.underworld_portal.aliases=Portal a la 'Profunda Oscuridad'
tile.endspark.aliases=Núcleo de Ender
tile.inverted_block.aliases=Bloque Inestable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobina de Calefacción
item.block_analyzer.aliases=Escáner Portátil
item.xray_glasses.aliases=Gafas Sónar
item.inverted_ingot.aliases=Lingote Inestable
tile.floating_block.aliases=Bloque Angélico
tile.heavenly_block.aliases=Bloque Angélico
tile.underworld_portal.aliases=Portal a la 'Profunda Oscuridad'
tile.endspark.aliases=Núcleo de Ender
tile.inverted_block.aliases=Bloque Inestable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobina de Calefacción
item.block_analyzer.aliases=Escáner Portátil
item.xray_glasses.aliases=Gafas Sónar
item.inverted_ingot.aliases=Lingote Inestable
tile.floating_block.aliases=Bloque Angélico
tile.heavenly_block.aliases=Bloque Angélico
tile.underworld_portal.aliases=Portal a la 'Profunda Oscuridad'
tile.endspark.aliases=Núcleo de Ender
tile.inverted_block.aliases=Bloque Inestable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobina de Calefacción
item.block_analyzer.aliases=Escáner Portátil
item.xray_glasses.aliases=Gafas Sónar
item.inverted_ingot.aliases=Lingote Inestable
tile.floating_block.aliases=Bloque Angélico
tile.heavenly_block.aliases=Bloque Angélico
tile.underworld_portal.aliases=Portal a la 'Profunda Oscuridad'
tile.endspark.aliases=Núcleo de Ender
tile.inverted_block.aliases=Bloque Inestable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ item.block_analyzer.aliases=Scanner portable
item.xray_glasses.aliases=Lunettes sonar
item.inverted_ingot.aliases=Lingot instable
item.chunchunmaru.aliases=Kikoku
tile.floating_block.aliases=Bloc angélique
tile.heavenly_block.aliases=Bloc angélique
tile.underworld_portal.aliases=Portail vers les ténèbres
tile.endspark.aliases=Noyau des limbes
tile.inverted_block.aliases=Bloc de lingots instables
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Bobine chauffante
item.block_analyzer.aliases=Scanner portable
item.xray_glasses.aliases=Lunettes sonar
item.inverted_ingot.aliases=Lingot instable
tile.floating_block.aliases=Bloc d'Ange
tile.heavenly_block.aliases=Bloc d'Ange
tile.underworld_portal.aliases=Portail pour le 'Noir Profond'
tile.endspark.aliases=Coeur de l'Ender
tile.inverted_block.aliases=Bloc de lingot instable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ item.block_analyzer.aliases=휴대용 스캐너
item.xray_glasses.aliases=소닉 고글
item.inverted_ingot.aliases=불안정한 주괴
item.chunchunmaru.aliases=귀곡
tile.floating_block.aliases=천사 블록
tile.heavenly_block.aliases=천사 블록
tile.underworld_portal.aliases=딥 다크로 가는 포탈
tile.temporal_gate.aliases=라스트 밀레니엄으로 가는 포탈
tile.endspark.aliases=엔더 코어
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ item.fire_battery.aliases=Grzejący zwój
item.block_analyzer.aliases=Przenośny skaner
item.xray_glasses.aliases=Sonarne gogle
item.inverted_ingot.aliases=Niestabilna sztaba
tile.floating_block.aliases=Anielski blok
tile.heavenly_block.aliases=Anielski blok
tile.inverted_block.aliases=Blok z niestabilnych sztab
tile.magic_wood.aliases=Magiczne drewno
tile.decorative_glass.0.aliases=Pogrubione szkło
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ item.block_analyzer.aliases=Escaneador Portátil
item.xray_glasses.aliases=Óculos Sonar
item.inverted_ingot.aliases=Barra Instável
item.chunchunmaru.aliases=Kikoku
tile.floating_block.aliases=Anjo-Bloco
tile.heavenly_block.aliases=Anjo-Bloco
tile.underworld_portal.aliases=Portal para o Escuro Profundo
tile.temporal_gate.aliases=Portal para o Último Milênio
tile.endspark.aliases=Núcleo de Ender
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ item.xray_glasses.aliases=Сонарные очки
item.inverted_ingot.aliases=Нестабильный слиток
item.inverted_ingot.stable.aliases=Мобиус "Нестабильный/Cтабильный" слиток
item.chunchunmaru.aliases=Kikoku
tile.floating_block.aliases=Ангельский блок
tile.heavenly_block.aliases=Ангельский блок
tile.underworld_portal.aliases=Портал в 'Глубокую темноту'
tile.temporal_gate.aliases=Портал в 'Прошедшее тысячелетие'
tile.endspark.aliases=Ядро Края
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ item.xray_glasses.aliases=声呐护目镜
item.inverted_ingot.aliases=不稳定金属锭
item.inverted_ingot.stable.aliases=莫比乌斯"稳定/不稳定"锭
item.chunchunmaru.aliases=鬼哭
tile.floating_block.aliases=天使方块
tile.heavenly_block.aliases=天使方块
tile.marginally_maximised_chest.aliases=微型箱
tile.radically_reduced_chest.aliases=迷你箱
tile.significantly_shrunk_chest.aliases=迷你箱
Expand Down