dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial 1.16.2 port

Browse Source
This commit is contained in:
raoulvdberge
2020-08-23 20:24:11 +02:00
parent 310af6bd27
commit 37953472e3
30 changed files with 99 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,9 +1,11 @@
# Refined Storage Changelog
### 1.9.3
- Port to Minecraft 1.16.2 (raoulvdberge)
- Fixed duplication bug with the Constructor (Darkere)
- Updated Japanese translation (a2y4)
- Updated Taiwanese translation (ForFunPenguin)
- Refactored autocrafting code (raoulvdberge)
### 1.9.2
- Fixed crash with Forge version 67 (Darkere)

12
build.gradle
View File

@@ -33,7 +33,7 @@ archivesBaseName = 'refinedstorage'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft {
mappings channel: 'snapshot', version: '20200707-1.16.1'
mappings channel: 'snapshot', version: '20200723-1.16.1'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs {
@@ -94,14 +94,14 @@ processResources {
}
dependencies {
minecraft 'net.minecraftforge:forge:1.16.1-32.0.67'
minecraft 'net.minecraftforge:forge:1.16.2-33.0.20'
compileOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.6:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.6")
compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19")
compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.16.1'
compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.16.2'
runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.16.1:12.0.4')
runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.16.2:12.1.0')
}
jar {

8
src/main/java/com/refinedmods/refinedstorage/RSLootFunctions.java
View File

@@ -15,9 +15,9 @@ public final class RSLootFunctions {
public static LootFunctionType CONTROLLER;
public static void register() {
STORAGE_BLOCK = Registry.register(Registry.field_239694_aZ_, new ResourceLocation(RS.ID, "storage_block"), new LootFunctionType(new StorageBlockLootFunction.Serializer()));
PORTABLE_GRID = Registry.register(Registry.field_239694_aZ_, new ResourceLocation(RS.ID, "portable_grid"), new LootFunctionType(new PortableGridBlockLootFunction.Serializer()));
CRAFTER = Registry.register(Registry.field_239694_aZ_, new ResourceLocation(RS.ID, "crafter"), new LootFunctionType(new CrafterLootFunction.Serializer()));
CONTROLLER = Registry.register(Registry.field_239694_aZ_, new ResourceLocation(RS.ID, "controller"), new LootFunctionType(new ControllerLootFunction.Serializer()));
STORAGE_BLOCK = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "storage_block"), new LootFunctionType(new StorageBlockLootFunction.Serializer()));
PORTABLE_GRID = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "portable_grid"), new LootFunctionType(new PortableGridBlockLootFunction.Serializer()));
CRAFTER = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "crafter"), new LootFunctionType(new CrafterLootFunction.Serializer()));
CONTROLLER = Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(RS.ID, "controller"), new LootFunctionType(new ControllerLootFunction.Serializer()));
}
}

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java
View File

@@ -38,7 +38,7 @@ public class ErrorCraftingMonitorElement implements ICraftingMonitorElement {
@Override
public List<ITextComponent> getTooltip() {
List<ITextComponent> items = new ArrayList<>(base.getTooltip());
items.add(new TranslationTextComponent(message).func_230530_a_(Styles.RED));
items.add(new TranslationTextComponent(message).setStyle(Styles.RED));
return items;
}

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java
View File

@@ -40,7 +40,7 @@ public class GridTab implements IGridTab {
@Override
public void drawTooltip(MatrixStack matrixStack, int x, int y, int screenWidth, int screenHeight, FontRenderer fontRenderer) {
if (!name.trim().equals("")) {
GuiUtils.drawHoveringText(matrixStack, Collections.singletonList(new StringTextComponent(name)), x, y, screenWidth, screenHeight, -1, fontRenderer);
// TODO GuiUtils.drawHoveringText(matrixStack, Collections.singletonList(new StringTextComponent(name)), x, y, screenWidth, screenHeight, -1, fontRenderer);
}
}

40
src/main/java/com/refinedmods/refinedstorage/command/PatternDumpCommand.java
View File

@@ -34,22 +34,22 @@ public class PatternDumpCommand implements Command<CommandSource> {
CraftingPattern pattern = PatternItem.fromCache(context.getSource().getWorld(), stack);
context.getSource().sendFeedback(new StringTextComponent("Crafting task factory ID: ").func_230530_a_(Styles.YELLOW).func_230529_a_(new StringTextComponent(pattern.getCraftingTaskFactoryId().toString()).func_230530_a_(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Crafting task factory ID: ").setStyle(Styles.YELLOW).append(new StringTextComponent(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false);
if (!pattern.isValid()) {
context.getSource().sendFeedback(new StringTextComponent("Pattern is invalid! Reason: ").func_230529_a_(pattern.getErrorMessage()).func_230530_a_(Styles.RED), false);
context.getSource().sendFeedback(new StringTextComponent("Pattern is invalid! Reason: ").append(pattern.getErrorMessage()).setStyle(Styles.RED), false);
} else {
context.getSource().sendFeedback(new StringTextComponent("Processing: ").func_230530_a_(Styles.YELLOW).func_230529_a_(new StringTextComponent(String.valueOf(processing)).func_230530_a_(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Exact: ").func_230530_a_(Styles.YELLOW).func_230529_a_(new StringTextComponent(String.valueOf(exact)).func_230530_a_(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Has allowed tag list: ").func_230530_a_(Styles.YELLOW).func_230529_a_(new StringTextComponent(String.valueOf(allowedTagList != null)).func_230530_a_(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Processing: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(processing)).setStyle(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Exact: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(exact)).setStyle(Styles.WHITE)), false);
context.getSource().sendFeedback(new StringTextComponent("Has allowed tag list: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(allowedTagList != null)).setStyle(Styles.WHITE)), false);
if (pattern.isProcessing()) {
for (int i = 0; i < pattern.getInputs().size(); ++i) {
if (!pattern.getInputs().get(i).isEmpty()) {
context.getSource().sendFeedback(new StringTextComponent("Item inputs in slot " + i + ":").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Item inputs in slot " + i + ":").setStyle(Styles.YELLOW), false);
for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) {
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").func_230529_a_(pattern.getInputs().get(i).get(j).getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getDisplayName()), false);
}
}
@@ -62,10 +62,10 @@ public class PatternDumpCommand implements Command<CommandSource> {
for (int i = 0; i < pattern.getFluidInputs().size(); ++i) {
if (!pattern.getFluidInputs().get(i).isEmpty()) {
context.getSource().sendFeedback(new StringTextComponent("Fluid inputs in slot " + i + ":").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Fluid inputs in slot " + i + ":").setStyle(Styles.YELLOW), false);
for (int j = 0; j < pattern.getFluidInputs().get(i).size(); ++j) {
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getFluidInputs().get(i).get(j).getAmount() + " mB ").func_230529_a_(pattern.getFluidInputs().get(i).get(j).getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getFluidInputs().get(i).get(j).getAmount() + " mB ").append(pattern.getFluidInputs().get(i).get(j).getDisplayName()), false);
}
}
@@ -76,29 +76,29 @@ public class PatternDumpCommand implements Command<CommandSource> {
}
}
context.getSource().sendFeedback(new StringTextComponent("Outputs").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false);
for (ItemStack output : pattern.getOutputs()) {
context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").func_230529_a_(output.getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").append(output.getDisplayName()), false);
}
context.getSource().sendFeedback(new StringTextComponent("Fluid outputs").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Fluid outputs").setStyle(Styles.YELLOW), false);
for (FluidStack output : pattern.getFluidOutputs()) {
context.getSource().sendFeedback(new StringTextComponent("- " + output.getAmount() + " mB ").func_230529_a_(output.getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- " + output.getAmount() + " mB ").append(output.getDisplayName()), false);
}
} else {
for (int i = 0; i < pattern.getInputs().size(); ++i) {
if (!pattern.getInputs().get(i).isEmpty()) {
context.getSource().sendFeedback(new StringTextComponent("Inputs in slot " + i + ":").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Inputs in slot " + i + ":").setStyle(Styles.YELLOW), false);
for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) {
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").func_230529_a_(pattern.getInputs().get(i).get(j).getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getDisplayName()), false);
}
}
}
context.getSource().sendFeedback(new StringTextComponent("Outputs").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false);
for (ItemStack output : pattern.getOutputs()) {
context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").func_230529_a_(output.getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").append(output.getDisplayName()), false);
}
boolean anyByproducts = false;
@@ -106,18 +106,18 @@ public class PatternDumpCommand implements Command<CommandSource> {
for (ItemStack byproduct : pattern.getByproducts()) {
if (!byproduct.isEmpty()) {
if (!anyByproducts) {
context.getSource().sendFeedback(new StringTextComponent("Byproducts").func_230530_a_(Styles.YELLOW), false);
context.getSource().sendFeedback(new StringTextComponent("Byproducts").setStyle(Styles.YELLOW), false);
anyByproducts = true;
}
context.getSource().sendFeedback(new StringTextComponent("- " + byproduct.getCount() + "x ").func_230529_a_(byproduct.getDisplayName()), false);
context.getSource().sendFeedback(new StringTextComponent("- " + byproduct.getCount() + "x ").append(byproduct.getDisplayName()), false);
}
}
}
}
} else {
context.getSource().sendFeedback(new StringTextComponent("You need to be holding a pattern in your hand.").func_230530_a_(Styles.RED), false);
context.getSource().sendFeedback(new StringTextComponent("You need to be holding a pattern in your hand.").setStyle(Styles.RED), false);
}
return 0;

5
src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java
View File

@@ -6,14 +6,15 @@ import com.refinedmods.refinedstorage.screen.BaseScreen;
import com.refinedmods.refinedstorage.screen.grid.GridScreen;
import com.refinedmods.refinedstorage.util.RenderUtils;
import mezz.jei.api.gui.handlers.IGuiContainerHandler;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nullable;
public class GuiContainerHandler implements IGuiContainerHandler<BaseScreen> {
public class GuiContainerHandler implements IGuiContainerHandler<ContainerScreen<?>> {
@Nullable
@Override
public Object getIngredientUnderMouse(BaseScreen screen, double mouseX, double mouseY) {
public Object getIngredientUnderMouse(ContainerScreen screen, double mouseX, double mouseY) {
mouseX -= screen.getGuiLeft();
mouseY -= screen.getGuiTop();

2
src/main/java/com/refinedmods/refinedstorage/integration/jei/RSJeiPlugin.java
View File

@@ -27,7 +27,7 @@ public class RSJeiPlugin implements IModPlugin {
@Override
public void registerGuiHandlers(IGuiHandlerRegistration registration) {
registration.addGuiContainerHandler(BaseScreen.class, new GuiContainerHandler());
// TODO registration.addGuiContainerHandler(BaseScreen.class, new GuiContainerHandler());
// TODO: https://github.com/mezz/JustEnoughItems/issues/1307
// registration.addGhostIngredientHandler(BaseScreen.class, new GhostIngredientHandler());

2
src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java
View File

@@ -64,7 +64,7 @@ public abstract class EnergyItem extends Item {
super.addInformation(stack, world, tooltip, flag);
if (!creative) {
stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).func_230530_a_(Styles.GRAY)));
stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY)));
}
}
}

4
src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java
View File

@@ -78,10 +78,10 @@ public class FilterItem extends Item {
public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
super.addInformation(stack, world, tooltip, flag);
tooltip.add(new TranslationTextComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).func_230530_a_(Styles.YELLOW));
tooltip.add(new TranslationTextComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).setStyle(Styles.YELLOW));
if (isModFilter(stack)) {
tooltip.add(new TranslationTextComponent("gui.refinedstorage.filter.mod_filter").func_230530_a_(Styles.BLUE));
tooltip.add(new TranslationTextComponent("gui.refinedstorage.filter.mod_filter").setStyle(Styles.BLUE));
}
FilterItemsItemHandler items = new FilterItemsItemHandler(stack);

6
src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java
View File

@@ -68,14 +68,14 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider {
StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id);
if (data != null) {
if (data.getCapacity() == -1) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY));
} else {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY));
}
}
if (flag.isAdvanced()) {
tooltip.add(new StringTextComponent(id.toString()).func_230530_a_(Styles.GRAY));
tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY));
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java
View File

@@ -67,7 +67,7 @@ public class NetworkCardItem extends Item {
pos.getY(),
pos.getZ(),
type.func_240901_a_().toString()
).func_230530_a_(Styles.GRAY));
).setStyle(Styles.GRAY));
}
}

2
src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java
View File

@@ -78,7 +78,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv
super.addInformation(stack, world, tooltip, flag);
if (isValid(stack)) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(Styles.GRAY));
}
}

16
src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java
View File

@@ -74,12 +74,12 @@ public class PatternItem extends Item implements ICraftingPatternProvider {
if (pattern.isValid()) {
if (ContainerScreen.hasShiftDown() || isProcessing(stack)) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.inputs").func_230530_a_(Styles.YELLOW));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.inputs").setStyle(Styles.YELLOW));
RenderUtils.addCombinedItemsToTooltip(tooltip, true, pattern.getInputs().stream().map(i -> i.size() > 0 ? i.get(0) : ItemStack.EMPTY).collect(Collectors.toList()));
RenderUtils.addCombinedFluidsToTooltip(tooltip, true, pattern.getFluidInputs().stream().map(i -> i.size() > 0 ? i.get(0) : FluidStack.EMPTY).collect(Collectors.toList()));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.outputs").func_230530_a_(Styles.YELLOW));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.outputs").setStyle(Styles.YELLOW));
}
RenderUtils.addCombinedItemsToTooltip(tooltip, true, pattern.getOutputs());
@@ -94,7 +94,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider {
"misc.refinedstorage.pattern.allowed_item_tag",
tag.toString(),
pattern.getInputs().get(i).get(0).getDisplayName()
).func_230530_a_(Styles.AQUA));
).setStyle(Styles.AQUA));
}
}
@@ -106,21 +106,21 @@ public class PatternItem extends Item implements ICraftingPatternProvider {
"misc.refinedstorage.pattern.allowed_fluid_tag",
tag.toString(),
pattern.getFluidInputs().get(i).get(0).getDisplayName()
).func_230530_a_(Styles.AQUA));
).setStyle(Styles.AQUA));
}
}
}
if (isExact(stack)) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.exact").func_230530_a_(Styles.BLUE));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.exact").setStyle(Styles.BLUE));
}
if (isProcessing(stack)) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.processing").func_230530_a_(Styles.BLUE));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.processing").setStyle(Styles.BLUE));
}
} else {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.invalid").func_230530_a_(Styles.RED));
tooltip.add(pattern.getErrorMessage().copyRaw().func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.invalid").setStyle(Styles.RED));
tooltip.add(pattern.getErrorMessage().copyRaw().setStyle(Styles.GRAY));
}
}

4
src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java
View File

@@ -80,12 +80,12 @@ public class SecurityCardItem extends Item {
super.addInformation(stack, world, tooltip, flag);
if (stack.hasTag() && stack.getTag().contains(NBT_OWNER_NAME)) {
tooltip.add(new TranslationTextComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).setStyle(Styles.GRAY));
}
for (Permission permission : Permission.values()) {
if (hasPermission(stack, permission)) {
tooltip.add(new StringTextComponent("- ").func_230529_a_(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).func_230530_a_(Styles.GRAY));
tooltip.add(new StringTextComponent("- ").append(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).setStyle(Styles.GRAY));
}
}
}

6
src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java
View File

@@ -68,14 +68,14 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider {
StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id);
if (data != null) {
if (data.getCapacity() == -1) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY));
} else {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY));
}
}
if (flag.isAdvanced()) {
tooltip.add(new StringTextComponent(id.toString()).func_230530_a_(Styles.GRAY));
tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY));
}
}
}

6
src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java
View File

@@ -93,9 +93,9 @@ public class UpgradeItem extends Item {
if (type.getFortuneLevel() > 0) {
tooltip.add(
new TranslationTextComponent("enchantment.minecraft.fortune")
.func_240702_b_(" ")
.func_230529_a_(new TranslationTextComponent("enchantment.level." + type.getFortuneLevel()))
.func_230530_a_(Styles.GRAY)
.appendString(" ")
.append(new TranslationTextComponent("enchantment.level." + type.getFortuneLevel()))
.setStyle(Styles.GRAY)
);
}
}

2
src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java
View File

@@ -65,7 +65,7 @@ public abstract class EnergyBlockItem extends BaseBlockItem {
super.addInformation(stack, world, tooltip, flag);
if (!creative) {
stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).func_230530_a_(Styles.GRAY)));
stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY)));
}
}
}

6
src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java
View File

@@ -53,14 +53,14 @@ public class FluidStorageBlockItem extends BaseBlockItem {
StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id);
if (data != null) {
if (data.getCapacity() == -1) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY));
} else {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY));
}
}
if (flag.isAdvanced()) {
tooltip.add(new StringTextComponent(id.toString()).func_230530_a_(Styles.GRAY));
tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY));
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java
View File

@@ -61,7 +61,7 @@ public class PortableGridBlockItem extends EnergyBlockItem {
public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
super.addInformation(stack, world, tooltip, flag);
tooltip.add(new TranslationTextComponent("block.refinedstorage.portable_grid.tooltip").func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("block.refinedstorage.portable_grid.tooltip").setStyle(Styles.GRAY));
}
@Override

6
src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java
View File

@@ -51,14 +51,14 @@ public class StorageBlockItem extends BaseBlockItem {
StorageDiskSyncData data = API.instance().getStorageDiskSync().getData(id);
if (data != null) {
if (data.getCapacity() == -1) {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored", API.instance().getQuantityFormatter().format(data.getStored())).setStyle(Styles.GRAY));
} else {
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("misc.refinedstorage.storage.stored_capacity", API.instance().getQuantityFormatter().format(data.getStored()), API.instance().getQuantityFormatter().format(data.getCapacity())).setStyle(Styles.GRAY));
}
}
if (flag.isAdvanced()) {
tooltip.add(new StringTextComponent(id.toString()).func_230530_a_(Styles.GRAY));
tooltip.add(new StringTextComponent(id.toString()).setStyle(Styles.GRAY));
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/item/blockitem/WirelessTransmitterBlockItem.java
View File

@@ -24,6 +24,6 @@ public class WirelessTransmitterBlockItem extends BaseBlockItem {
public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
super.addInformation(stack, world, tooltip, flag);
tooltip.add(new TranslationTextComponent("block.refinedstorage.wireless_transmitter.tooltip", new TranslationTextComponent("block.refinedstorage.cable")).func_230530_a_(Styles.GRAY));
tooltip.add(new TranslationTextComponent("block.refinedstorage.wireless_transmitter.tooltip", new TranslationTextComponent("block.refinedstorage.cable")).setStyle(Styles.GRAY));
}
}

4
src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java
View File

@@ -2,10 +2,10 @@ package com.refinedmods.refinedstorage.render.resourcepack;
import com.refinedmods.refinedstorage.render.RenderSettings;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.ClientResourcePackInfo;
import net.minecraft.client.resources.ReloadListener;
import net.minecraft.profiler.IProfiler;
import net.minecraft.resources.IResourceManager;
import net.minecraft.resources.ResourcePackInfo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -17,7 +17,7 @@ public class ResourcePackListener extends ReloadListener<RSResourcePackSection>
@Override
protected RSResourcePackSection prepare(IResourceManager resourceManager, IProfiler profiler) {
for (ClientResourcePackInfo info : Minecraft.getInstance().getResourcePackList().getEnabledPacks()) {
for (ResourcePackInfo info : Minecraft.getInstance().getResourcePackList().getEnabledPacks()) {
try {
RSResourcePackSection section = info.getResourcePack().getMetadata(RSResourcePackSection.DESERIALIZER);

2
src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
View File

@@ -68,7 +68,7 @@ public abstract class AmountSpecifyingScreen<T extends Container> extends BaseSc
addButton(amountField);
setFocused(amountField);
setFocusedDefault(amountField); // TODO ?
int[] increments = getIncrements();

10
src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
View File

@@ -124,8 +124,8 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
func_230459_a_(matrixStack, mouseX, mouseY);
}
@Override // drawGuiContainerBackgroundLayer
protected void func_230450_a_(MatrixStack matrixStack, float renderPartialTicks, int mouseX, int mouseY) {
@Override
protected void drawGuiContainerBackgroundLayer(MatrixStack matrixStack, float renderPartialTicks, int mouseX, int mouseY) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
renderBackground(matrixStack, guiLeft, guiTop, mouseX, mouseY);
@@ -149,8 +149,8 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
}
}
@Override // drawGuiContainerForegroundLayer
protected void func_230451_b_(MatrixStack matrixStack, int mouseX, int mouseY) {
@Override
protected void drawGuiContainerForegroundLayer(MatrixStack matrixStack, int mouseX, int mouseY) {
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
mouseX -= guiLeft;
@@ -334,7 +334,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
}
public void renderTooltip(MatrixStack matrixStack, @Nonnull ItemStack stack, int x, int y, List<ITextComponent> lines) {
GuiUtils.drawHoveringText(stack, matrixStack, lines, x, y, width, height, -1, font);
// TODO GuiUtils.drawHoveringText(stack, matrixStack, lines, x, y, width, height, -1, font);
}
protected void onPreInit() {

3
src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java
View File

@@ -69,7 +69,8 @@ public class SecurityManagerScreen extends BaseScreen<SecurityManagerContainer>
for (int i = 0; i < permissions.length; ++i) {
CheckboxWidget permission = permissions[i];
if (RenderUtils.inBounds(permission.x - guiLeft, permission.y - guiTop, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) {
// getWidth_CLASH => getHeight
if (RenderUtils.inBounds(permission.x - guiLeft, permission.y - guiTop, permission.getWidth(), permission.getWidth_CLASH(), mouseX, mouseY)) {
renderTooltip(matrixStack, mouseX, mouseY, I18n.format("gui.refinedstorage.security_manager.permission." + i + ".tooltip"));
}
}

21
src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
View File

@@ -12,6 +12,7 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IReorderingProcessor;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.text.*;
import net.minecraftforge.client.event.RenderTooltipEvent;
@@ -59,10 +60,10 @@ public final class RenderUtils {
}
if (displayAmount) {
data = new StringTextComponent(amount + "x ").func_230529_a_(data);
data = new StringTextComponent(amount + "x ").append(data);
}
tooltip.add(data.func_230530_a_(Styles.GRAY));
tooltip.add(data.setStyle(Styles.GRAY));
}
}
}
@@ -87,10 +88,10 @@ public final class RenderUtils {
}
if (displayMb) {
data = new StringTextComponent(API.instance().getQuantityFormatter().formatInBucketForm(amount) + " ").func_230529_a_(data);
data = new StringTextComponent(API.instance().getQuantityFormatter().formatInBucketForm(amount) + " ").append(data);
}
tooltip.add(data.func_230530_a_(Styles.GRAY));
tooltip.add(data.setStyle(Styles.GRAY));
}
}
}
@@ -162,15 +163,15 @@ public final class RenderUtils {
List<ITextProperties> wrappedTextLines = new ArrayList<>();
for (int i = 0; i < textLines.size(); i++) {
ITextProperties textLine = textLines.get(i);
List<ITextProperties> wrappedLine = font.func_238425_b_(textLine, tooltipTextWidth);
List<IReorderingProcessor> wrappedLine = font.func_238425_b_(textLine, tooltipTextWidth);
if (i == 0)
titleLinesCount = wrappedLine.size();
for (ITextProperties line : wrappedLine) {
int lineWidth = font.getStringWidth(line.getString());
for (IReorderingProcessor line : wrappedLine) {
/* TODO int lineWidth = font.getStringWidth(line.getString());
if (lineWidth > wrappedTooltipWidth)
wrappedTooltipWidth = lineWidth;
wrappedTextLines.add(line);
wrappedTextLines.add(line);*/
}
}
tooltipTextWidth = wrappedTooltipWidth;
@@ -235,7 +236,7 @@ public final class RenderUtils {
for (int lineNumber = 0; lineNumber < textLines.size(); ++lineNumber) {
ITextProperties line = textLines.get(lineNumber);
if (line != null)
font.func_238416_a_(line, (float) tooltipX, (float) tooltipY, -1, true, textLocation, renderType, false, 0, 15728880);
// TODO font.func_238416_a_(line, (float) tooltipX, (float) tooltipY, -1, true, textLocation, renderType, false, 0, 15728880);
if (lineNumber + 1 == titleLinesCount)
tooltipY += 2;
@@ -296,4 +297,4 @@ public final class RenderUtils {
public static boolean inBounds(int x, int y, int w, int h, double ox, double oy) {
return ox >= x && ox <= x + w && oy >= y && oy <= y + h;
}
}
}

2
src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java
View File

@@ -78,7 +78,7 @@ public final class WorldUtils {
}
public static void sendNoPermissionMessage(PlayerEntity player) {
player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").func_230530_a_(Styles.RED), player.getUniqueID());
player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").setStyle(Styles.RED), player.getUniqueID());
}
public static RayTraceResult rayTracePlayer(World world, PlayerEntity player) {

7
src/main/resources/META-INF/mods.toml
View File

@@ -1,6 +1,7 @@
modLoader="javafml"
loaderVersion="[32,)"
loaderVersion="[33,)"
issueTrackerURL="https://github.com/refinedmods/refinedstorage"
license="MIT"
[[mods]]
modId="refinedstorage"
version="${version}"
@@ -18,8 +19,8 @@ An elegant solution to your hoarding problem
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="[32.0.67,)" #mandatory
versionRange="[33.0.20,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
side="BOTH"
side="BOTH"

4
src/main/resources/pack.mcmeta
View File

@@ -1,6 +1,6 @@
{
"pack": {
"description": "Refined Storage resources",
"pack_format": 5
"pack_format": 6
}
}
}